diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
| commit | 940b4d1848e8c70ab7642901a68594e8016caffc (patch) | |
| tree | eb72f344ee6c3d9b80a7ecc079ea79e9fba8676d /external | |
| parent | Initial commit. (diff) | |
| download | libreoffice-upstream.tar.xz libreoffice-upstream.zip | |
Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external')
1156 files changed, 64465 insertions, 0 deletions
diff --git a/external/Makefile b/external/Makefile new file mode 100644 index 000000000..ccb1c85a0 --- /dev/null +++ b/external/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/Module_external.mk b/external/Module_external.mk new file mode 100644 index 000000000..286759927 --- /dev/null +++ b/external/Module_external.mk @@ -0,0 +1,110 @@ +# -*- 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,external)) + +ifeq ($(COM),MSC) +$(eval $(call gb_Module_add_moduledir,external,msc-externals)) +endif + +$(eval $(call gb_Module_add_moduledirs,external,\ + $(if $(filter-out iOS,$(OS)),$(call gb_Helper_optional,XMLSEC,xmlsec)) \ + $(call gb_Helper_optional,ABW,libabw) \ + $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ + $(call gb_Helper_optional,APR,apr) \ + $(call gb_Helper_optional,BOOST,boost) \ + $(call gb_Helper_optional,BREAKPAD,breakpad) \ + $(call gb_Helper_optional,BSH,beanshell) \ + $(call gb_Helper_optional,BZIP2,bzip2) \ + $(call gb_Helper_optional,CAIRO,cairo) \ + $(call gb_Helper_optional,CDR,libcdr) \ + $(call gb_Helper_optional,OPENCL,clew) \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional,LIBCMIS,libcmis) \ + $(call gb_Helper_optional,COINMP,coinmp) \ + $(call gb_Helper_optional,CPPUNIT,cppunit) \ + $(call gb_Helper_optional,CT2N,ct2n) \ + $(call gb_Helper_optional,CURL,curl) \ + dtoa \ + $(call gb_Helper_optional,EBOOK,libebook) \ + $(call gb_Helper_optional,EPM,epm) \ + $(call gb_Helper_optional,EPOXY,epoxy) \ + $(call gb_Helper_optional,EPUBGEN,libepubgen) \ + $(call gb_Helper_optional,ETONYEK,libetonyek) \ + $(call gb_Helper_optional,EXPAT,expat) \ + $(call gb_Helper_optional,FIREBIRD,firebird) \ + $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ + $(call gb_Helper_optional,FREEHAND,libfreehand) \ + $(call gb_Helper_optional,FREETYPE,freetype) \ + $(call gb_Helper_optional,GLM,glm) \ + $(call gb_Helper_optional,GPGMEPP,gpgmepp) \ + $(call gb_Helper_optional,GRAPHITE,graphite) \ + $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ + $(call gb_Helper_optional,HSQLDB,hsqldb) \ + $(call gb_Helper_optional,HUNSPELL,hunspell) \ + $(call gb_Helper_optional,HYPHEN,hyphen) \ + $(call gb_Helper_optional,ICU,icu) \ + $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ + $(call gb_Helper_optional,LIBJPEG_TURBO,libjpeg-turbo) \ + $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ + $(call gb_Helper_optional,LCMS2,lcms2) \ + $(call gb_Helper_optional,LIBASSUAN,libassuan) \ + $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ + $(call gb_Helper_optional,LIBEOT,libeot) \ + $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ + $(call gb_Helper_optional,LIBFFI,libffi) \ + $(call gb_Helper_optional,LIBGPGERROR,libgpg-error) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ + $(call gb_Helper_optional,LIBNUMBERTEXT,libnumbertext) \ + $(call gb_Helper_optional,LIBPNG,libpng) \ + $(call gb_Helper_optional,LIBXML2,libxml2) \ + $(call gb_Helper_optional,LIBXSLT,libxslt) \ + $(call gb_Helper_optional,LPSOLVE,lpsolve) \ + $(call gb_Helper_optional,LIBTOMMATH,libtommath) \ + $(call gb_Helper_optional,LXML,lxml) \ + $(call gb_Helper_optional,MARIADB_CONNECTOR_C,mariadb-connector-c) \ + $(call gb_Helper_optional,MDDS,mdds) \ + $(call gb_Helper_optional,MDNSRESPONDER,mdnsresponder) \ + $(if $(WITH_EXTRA_EXTENSIONS),misc_extensions) \ + $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ + $(call gb_Helper_optional,MSPUB,libmspub) \ + $(call gb_Helper_optional,MWAW,libmwaw) \ + $(call gb_Helper_optional,MYTHES,mythes) \ + $(call gb_Helper_optional,NEON,neon) \ + $(call gb_Helper_optional,NSS,nss) \ + $(call gb_Helper_optional,ODFGEN,libodfgen) \ + $(call gb_Helper_optional,OPENLDAP,openldap) \ + $(call gb_Helper_optional,OPENSSL,openssl) \ + $(call gb_Helper_optional,ORCUS,liborcus) \ + $(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \ + $(call gb_Helper_optional,PAGEMAKER,libpagemaker) \ + $(call gb_Helper_optional,PDFIUM,pdfium) \ + $(call gb_Helper_optional,POPPLER,poppler) \ + $(call gb_Helper_optional,POSTGRESQL,postgresql) \ + $(call gb_Helper_optional,PYTHON,python3) \ + $(call gb_Helper_optional,QXP,libqxp) \ + $(call gb_Helper_optional,QRCODEGEN,qrcodegen) \ + $(call gb_Helper_optional,REDLAND,redland) \ + $(call gb_Helper_optional,REVENGE,librevenge) \ + $(call gb_Helper_optional,RHINO,rhino) \ + $(call gb_Helper_optional,SERF,serf) \ + $(call gb_Helper_optional,SKIA,skia) \ + $(call gb_Helper_optional,STAROFFICE,libstaroffice) \ + $(if $(filter WNT,$(OS)),twain_dsm) \ + $(call gb_Helper_optional,UCPP,ucpp) \ + $(call gb_Helper_optional,VISIO,libvisio) \ + $(call gb_Helper_optional,WPD,libwpd) \ + $(call gb_Helper_optional,WPG,libwpg) \ + $(call gb_Helper_optional,WPS,libwps) \ + $(call gb_Helper_optional,XSLTML,xsltml) \ + $(call gb_Helper_optional,ZLIB,zlib) \ + $(call gb_Helper_optional,ZMF,libzmf) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/README b/external/README new file mode 100644 index 000000000..1f245df45 --- /dev/null +++ b/external/README @@ -0,0 +1 @@ +External projects bundled with LibreOffice. diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk new file mode 100644 index 000000000..2bff13b93 --- /dev/null +++ b/external/apache-commons/ExternalPackage_apache_commons_logging.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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging,apache_commons_logging)) + +$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging,apache_commons_logging)) + +$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-$(COMMONS_LOGGING_VERSION).jar,target/commons-logging-$(COMMONS_LOGGING_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk new file mode 100644 index 000000000..640810d9c --- /dev/null +++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk @@ -0,0 +1,31 @@ +# -*- 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,apache_commons_logging)) + +$(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,apache_commons_logging,build) : + $(call gb_Trace_StartRange,apache_commons_logging,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + $(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \ + compile build-jar \ + ) + $(call gb_Trace_EndRange,apache_commons_logging,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/Makefile b/external/apache-commons/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/apache-commons/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/apache-commons/Module_apache-commons.mk b/external/apache-commons/Module_apache-commons.mk new file mode 100644 index 000000000..45aabe229 --- /dev/null +++ b/external/apache-commons/Module_apache-commons.mk @@ -0,0 +1,18 @@ +# -*- 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,apache-commons)) + +$(eval $(call gb_Module_add_targets,apache-commons,\ + ExternalPackage_apache_commons_logging \ + ExternalProject_apache_commons_logging \ + UnpackedTarball_apache_commons_logging \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/README b/external/apache-commons/README new file mode 100644 index 000000000..18944aca4 --- /dev/null +++ b/external/apache-commons/README @@ -0,0 +1 @@ +Java library; used for logging in Extensions, from [http://commons.apache.org/] diff --git a/external/apache-commons/UnpackedTarball_apache_commons_logging.mk b/external/apache-commons/UnpackedTarball_apache_commons_logging.mk new file mode 100644 index 000000000..1d5ad3dc2 --- /dev/null +++ b/external/apache-commons/UnpackedTarball_apache_commons_logging.mk @@ -0,0 +1,22 @@ +# -*- 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,apache_commons_logging)) + +$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_logging,$(APACHE_COMMONS_LOGGING_TARBALL),,apache-commons)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_logging,\ + build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_logging,\ + external/apache-commons/patches/logging.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/apache-commons/patches/logging.patch b/external/apache-commons/patches/logging.patch new file mode 100644 index 000000000..c225e5a30 --- /dev/null +++ b/external/apache-commons/patches/logging.patch @@ -0,0 +1,46 @@ +--- misc/commons-logging-1.1.1-src/build.xml 2007-11-22 00:27:52.000000000 +0100 ++++ misc/build/commons-logging-1.1.1-src/build.xml 2008-06-24 14:23:56.316301736 +0200 +@@ -129,12 +129,6 @@ + + <!-- ========== Compiler Defaults ========================================= --> + +- <!-- Version of java class files to generate. --> +- <property name="target.version" value="1.2"/> +- +- <!-- Version of java source to accept --> +- <property name="source.version" value="1.2"/> +- + <!-- Should Java compilations set the 'debug' compiler option? --> + <property name="compile.debug" value="true"/> + +@@ -283,6 +277,10 @@ + classpathref="compile.classpath" + classname="org.apache.avalon.framework.logger.Logger"/> + ++ <available property="servlet-api.present" ++ classpathref="compile.classpath" ++ classname="javax.servlet.ServletContextListener"/> ++ + <available file="${log4j12.jar}" property="log4j12.present"/> + <available file="${log4j13.jar}" property="log4j13.present"/> + <available file="${build.home}/docs" property="maven.generated.docs.present"/> +@@ -362,8 +360,8 @@ + debug="${compile.debug}" + deprecation="${compile.deprecation}" + optimize="${compile.optimize}" +- source="${source.version}" +- target="${target.version}"> ++ source="${ant.build.javac.source}" ++ target="${ant.build.javac.target}"> + + <classpath refid="compile.classpath"/> + +@@ -373,6 +371,8 @@ + unless="logkit.present"/> + <exclude name="org/apache/commons/logging/impl/AvalonLogger.java" + unless="avalon-framework.present"/> ++ <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java" ++ unless="servlet-api.present"/> + </javac> + </target> + diff --git a/external/apr/ExternalProject_apr.mk b/external/apr/ExternalProject_apr.mk new file mode 100644 index 000000000..1c94480e5 --- /dev/null +++ b/external/apr/ExternalProject_apr.mk @@ -0,0 +1,43 @@ +# -*- 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,apr)) + +$(eval $(call gb_ExternalProject_register_targets,apr,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_nmake,apr,build)) + +ifeq ($(COM),MSC) +$(call gb_ExternalProject_get_state_target,apr,build): + $(call gb_Trace_StartRange,apr,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + nmake -nologo -f apr.mak \ + CFG="apr - Win32 $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)" \ + RECURSE=0 \ + ) + $(call gb_Trace_EndRange,apr,EXTERNAL) + +else +$(call gb_ExternalProject_get_state_target,apr,build): + $(call gb_Trace_StartRange,apr,EXTERNAL) + +$(call gb_ExternalProject_run,build,\ + $(if $(ENABLE_MACOSX_SANDBOX),ac_cv_func_fdatasync=no) \ + ./configure \ + --enable-static --disable-shared \ + --with-pic \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ + && $(MAKE) libapr-1.la \ + ) + $(call gb_Trace_EndRange,apr,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/apr/ExternalProject_apr_util.mk b/external/apr/ExternalProject_apr_util.mk new file mode 100644 index 000000000..a311f32e8 --- /dev/null +++ b/external/apr/ExternalProject_apr_util.mk @@ -0,0 +1,45 @@ +# -*- 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,apr_util)) + +$(eval $(call gb_ExternalProject_use_external_project,apr_util,apr)) + +$(eval $(call gb_ExternalProject_register_targets,apr_util,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_nmake,apr_util,build)) + +ifeq ($(COM),MSC) +$(call gb_ExternalProject_get_state_target,apr_util,build): + $(call gb_Trace_StartRange,apr_util,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + nmake -nologo -f aprutil.mak \ + CFG="aprutil - Win32 $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)" \ + RECURSE=0 \ + ) + $(call gb_Trace_EndRange,apr_util,EXTERNAL) + +else +$(call gb_ExternalProject_get_state_target,apr_util,build): + $(call gb_Trace_StartRange,apr_util,EXTERNAL) + +$(call gb_ExternalProject_run,build,\ + ./configure \ + --enable-static --disable-shared \ + --with-pic \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ + --with-apr=$(call gb_UnpackedTarball_get_dir,apr)/apr-1-config \ + && $(MAKE) libaprutil-1.la \ + ) + $(call gb_Trace_EndRange,apr_util,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/apr/Makefile b/external/apr/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/apr/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/apr/Module_apr.mk b/external/apr/Module_apr.mk new file mode 100644 index 000000000..6bb85fb76 --- /dev/null +++ b/external/apr/Module_apr.mk @@ -0,0 +1,19 @@ +# -*- 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,apr)) + +$(eval $(call gb_Module_add_targets,apr,\ + UnpackedTarball_apr \ + UnpackedTarball_apr_util \ + ExternalProject_apr \ + ExternalProject_apr_util \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/apr/README b/external/apr/README new file mode 100644 index 000000000..778bdfdf6 --- /dev/null +++ b/external/apr/README @@ -0,0 +1,5 @@ +The mission of the Apache Portable Runtime (APR) project is to create +and maintain software libraries that provide a predictable and consistent +interface to underlying platform-specific implementations. + +From [http://apr.apache.org/]. diff --git a/external/apr/UnpackedTarball_apr.mk b/external/apr/UnpackedTarball_apr.mk new file mode 100644 index 000000000..c3be61670 --- /dev/null +++ b/external/apr/UnpackedTarball_apr.mk @@ -0,0 +1,21 @@ +# -*- 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,apr)) + +$(eval $(call gb_UnpackedTarball_set_tarball,apr,$(APR_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,apr,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,apr, \ + external/apr/exit.patch \ + external/apr/uuid.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/apr/UnpackedTarball_apr_util.mk b/external/apr/UnpackedTarball_apr_util.mk new file mode 100644 index 000000000..06860f139 --- /dev/null +++ b/external/apr/UnpackedTarball_apr_util.mk @@ -0,0 +1,22 @@ +# -*- 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,apr_util)) + +$(eval $(call gb_UnpackedTarball_set_tarball,apr_util,$(APR_UTIL_TARBALL))) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,apr_util,\ + aprutil.mak \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,apr_util,\ + external/apr/windows.build.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/apr/exit.patch b/external/apr/exit.patch new file mode 100644 index 000000000..5db6a9471 --- /dev/null +++ b/external/apr/exit.patch @@ -0,0 +1,26 @@ +--- configure ++++ configure +@@ -23549,6 +23549,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdio.h> ++#include <stdlib.h> + #include <sys/types.h> + #ifdef WIN32 + #define binmode "b" +@@ -23910,6 +23910,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdio.h> ++#include <stdlib.h> + #include <sys/types.h> + #ifdef WIN32 + #define binmode "b" +@@ -24347,6 +24347,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdio.h> ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/uio.h> + #ifdef WIN32 diff --git a/external/apr/uuid.patch b/external/apr/uuid.patch new file mode 100644 index 000000000..53c75f13c --- /dev/null +++ b/external/apr/uuid.patch @@ -0,0 +1,241 @@ +--- configure ++++ configure +@@ -26343,235 +26343,9 @@ + + echo "${nl}Checking for OS UUID Support..." + +-for ac_header in uuid.h uuid/uuid.h sys/uuid.h +-do : +- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- break +-fi +- +-done +- +- +-apr_revert_save_LIBS=$LIBS +- +-# Prefer the flavor(s) that live in libc; +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_create" >&5 +-$as_echo_n "checking for library containing uuid_create... " >&6; } +-if ${ac_cv_search_uuid_create+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_func_search_save_LIBS=$LIBS +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char uuid_create (); +-int +-main () +-{ +-return uuid_create (); +- ; +- return 0; +-} +-_ACEOF +-for ac_lib in '' uuid; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_search_uuid_create=$ac_res +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext +- if ${ac_cv_search_uuid_create+:} false; then : +- break +-fi +-done +-if ${ac_cv_search_uuid_create+:} false; then : +- +-else +- ac_cv_search_uuid_create=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_create" >&5 +-$as_echo "$ac_cv_search_uuid_create" >&6; } +-ac_res=$ac_cv_search_uuid_create +-if test "$ac_res" != no; then : +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- +-fi +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate" >&5 +-$as_echo_n "checking for library containing uuid_generate... " >&6; } +-if ${ac_cv_search_uuid_generate+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_func_search_save_LIBS=$LIBS +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char uuid_generate (); +-int +-main () +-{ +-return uuid_generate (); +- ; +- return 0; +-} +-_ACEOF +-for ac_lib in '' uuid; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_search_uuid_generate=$ac_res +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext +- if ${ac_cv_search_uuid_generate+:} false; then : +- break +-fi +-done +-if ${ac_cv_search_uuid_generate+:} false; then : +- +-else +- ac_cv_search_uuid_generate=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate" >&5 +-$as_echo "$ac_cv_search_uuid_generate" >&6; } +-ac_res=$ac_cv_search_uuid_generate +-if test "$ac_res" != no; then : +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- +-fi +- +-if test "$ac_cv_search_uuid_create" = "none required" -o \ +- "$ac_cv_search_uuid_generate" = "none required"; then +- LIBS=$apr_revert_save_LIBS +-fi +- +-for ac_func in uuid_create uuid_generate +-do : +- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for os uuid usability" >&5 +-$as_echo_n "checking for os uuid usability... " >&6; } +-if ${apr_cv_osuuid+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +-# Ensure this test closely mirrors misc/unix/rand.c! +-uuid_includes=" +-#if defined(HAVE_SYS_TYPES_H) +-#include <sys/types.h> +-#endif +-#if defined(HAVE_UNISTD_H) +-#include <unistd.h> +-#endif +-#if defined(HAVE_UUID_H) +-#include <uuid.h> +-#elif defined(HAVE_UUID_UUID_H) +-#include <uuid/uuid.h> +-#elif defined(HAVE_SYS_UUID_H) +-#include <sys/uuid.h> +-#endif +-" +- apr_cv_osuuid=no +- if test $ac_cv_func_uuid_create = yes; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$uuid_includes +-int +-main () +-{ +- +- uuid_t g; +- uint32_t s; +- uuid_create(&g, &s); +- if (s == uuid_s_ok) s = 0; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- apr_cv_osuuid=yes +-else +- apr_cv_func_uuid_create=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- fi +- if test $ac_cv_func_uuid_generate = yes; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$uuid_includes +-int +-main () +-{ +- +- uuid_t g; +- uuid_generate(g); +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- apr_cv_osuuid=yes +-else +- apr_cv_func_uuid_generate=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_cv_osuuid" >&5 +-$as_echo "$apr_cv_osuuid" >&6; } +- +-if test $apr_cv_osuuid = yes; then +- osuuid="1" +-else +- osuuid="0" +- LIBS=$apr_revert_save_LIBS +-fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo no >&6; } ++osuuid="0" + + + diff --git a/external/apr/windows.build.patch.1 b/external/apr/windows.build.patch.1 new file mode 100644 index 000000000..929910bea --- /dev/null +++ b/external/apr/windows.build.patch.1 @@ -0,0 +1,53 @@ +diff -ur apr_util.org/aprutil.mak apr_util/aprutil.mak +--- apr_util.org/aprutil.mak 2014-03-05 16:40:02.385701779 +0100 ++++ apr_util/aprutil.mak 2014-03-05 16:40:49.409702332 +0100 +@@ -210,8 +210,6 @@ + "$(INTDIR)\apr_uri.obj" \ + "$(INTDIR)\xlate.obj" \ + "$(INTDIR)\apr_xml.obj" \ +- "..\apr-iconv\LibR\apriconv-1.lib" \ +- ".\xml\expat\lib\LibR\xml.lib" + + "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< +@@ -406,8 +404,6 @@ + "$(INTDIR)\apr_uri.obj" \ + "$(INTDIR)\xlate.obj" \ + "$(INTDIR)\apr_xml.obj" \ +- "..\apr-iconv\LibD\apriconv-1.lib" \ +- ".\xml\expat\lib\LibD\xml.lib" + + "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< +@@ -602,8 +598,6 @@ + "$(INTDIR)\apr_uri.obj" \ + "$(INTDIR)\xlate.obj" \ + "$(INTDIR)\apr_xml.obj" \ +- "..\apr-iconv\x64\LibR\apriconv-1.lib" \ +- ".\xml\expat\lib\x64\LibR\xml.lib" + + "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< +@@ -798,8 +792,6 @@ + "$(INTDIR)\apr_uri.obj" \ + "$(INTDIR)\xlate.obj" \ + "$(INTDIR)\apr_xml.obj" \ +- "..\apr-iconv\x64\LibD\apriconv-1.lib" \ +- ".\xml\expat\lib\x64\LibD\xml.lib" + + "$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< +diff -ur apr_util.org/include/apu.hw apr_util/include/apu.hw +--- apr_util.org/include/apu.hw 2014-03-05 16:40:02.377701779 +0100 ++++ apr_util/include/apu.hw 2014-03-05 16:40:38.769702207 +0100 +@@ -138,8 +138,8 @@ + #define APU_HAVE_NSS 0 + #endif + +-#define APU_HAVE_APR_ICONV 1 +-#define APU_HAVE_ICONV 0 ++#undef APU_HAVE_APR_ICONV ++#undef APU_HAVE_ICONV + #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV) + + #endif /* APU_H */ diff --git a/external/beanshell/ExternalPackage_beanshell.mk b/external/beanshell/ExternalPackage_beanshell.mk new file mode 100644 index 000000000..ea22d8394 --- /dev/null +++ b/external/beanshell/ExternalPackage_beanshell.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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell)) + +$(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell)) + +$(eval $(call gb_ExternalPackage_add_file,beanshell,$(LIBO_SHARE_JAVA_FOLDER)/bsh.jar,dist/bsh-2.0b6.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/beanshell/ExternalProject_beanshell.mk b/external/beanshell/ExternalProject_beanshell.mk new file mode 100644 index 000000000..d6ce0af49 --- /dev/null +++ b/external/beanshell/ExternalProject_beanshell.mk @@ -0,0 +1,29 @@ +# -*- 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,beanshell)) + +$(eval $(call gb_ExternalProject_register_targets,beanshell,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,beanshell,build) : + $(call gb_Trace_StartRange,beanshell,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + $(if $(debug),-Dbuild.debug="on") \ + ) + $(call gb_Trace_EndRange,beanshell,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/beanshell/Makefile b/external/beanshell/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/beanshell/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/beanshell/Module_beanshell.mk b/external/beanshell/Module_beanshell.mk new file mode 100644 index 000000000..14432fd2a --- /dev/null +++ b/external/beanshell/Module_beanshell.mk @@ -0,0 +1,18 @@ +# -*- 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,beanshell)) + +$(eval $(call gb_Module_add_targets,beanshell,\ + ExternalPackage_beanshell \ + ExternalProject_beanshell \ + UnpackedTarball_beanshell \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/beanshell/README b/external/beanshell/README new file mode 100644 index 000000000..0b03fd35a --- /dev/null +++ b/external/beanshell/README @@ -0,0 +1,4 @@ +Java interpreter from [http://www.beanshell.org/] with some patches. + +So you can write java in command shell; interactive java good for prototyping/macros. + diff --git a/external/beanshell/UnpackedTarball_beanshell.mk b/external/beanshell/UnpackedTarball_beanshell.mk new file mode 100644 index 000000000..dc0ce6dc6 --- /dev/null +++ b/external/beanshell/UnpackedTarball_beanshell.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,beanshell)) + +$(eval $(call gb_UnpackedTarball_set_tarball,beanshell,$(BSH_TARBALL),,beanshell)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,beanshell,\ + engine/src/TestBshScriptEngine.java \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,beanshell,\ + external/beanshell/bsh-2.0b1-src.patch \ + external/beanshell/beanshell-invoke.patch \ + external/beanshell/java9.patch.0 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/beanshell/beanshell-invoke.patch b/external/beanshell/beanshell-invoke.patch new file mode 100644 index 000000000..b78f1db61 --- /dev/null +++ b/external/beanshell/beanshell-invoke.patch @@ -0,0 +1,78 @@ +--- old/beanshell/engine/src/bsh/engine/BshScriptEngine.java ++++ new/beanshell/engine/src/bsh/engine/BshScriptEngine.java +@@ -229,6 +229,12 @@ + } + } + ++ public Object invoke( Object thiz, String name, Object... args ) ++ throws ScriptException, NoSuchMethodException ++ { ++ return invokeMethod( thiz, name, args ); ++ } ++ + /** + * Same as invoke(Object, String, Object...) with <code>null</code> as the + * first argument. Used to call top-level procedures defined in scripts. +@@ -249,6 +255,12 @@ + return invokeMethod( getGlobal(), name, args ); + } + ++ public Object invoke( String name, Object... args ) ++ throws ScriptException, NoSuchMethodException ++ { ++ return invokeFunction( name, args ); ++ } ++ + /** + * Returns an implementation of an interface using procedures compiled in the + * interpreter. The methods of the interface may be implemented using the +--- old/beanshell/engine/src/TestBshScriptEngine.java ++++ new/beanshell/engine/src/TestBshScriptEngine.java +@@ -2,11 +2,12 @@ + import java.io.*; + import javax.script.*; + import static javax.script.ScriptContext.*; ++import java.lang.reflect.*; + + public class TestBshScriptEngine + { + public static void main( String [] args ) +- throws ScriptException, NoSuchMethodException, IOException ++ throws ScriptException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, IOException + { + ScriptEngineManager manager = + new ScriptEngineManager( bsh.Interpreter.class.getClassLoader() ); +@@ -39,11 +40,23 @@ + assertTrue( engine.get("bar").equals("gee") ); + assertTrue( engine.eval("bar").equals("gee") ); + ++ // use reflection to pick available method ++ Method invokeMe = null; ++ try { ++ invokeMe = Invocable.class.getMethod( "invokeFunction", String.class, Object[].class ); ++ } catch ( Exception e ) { } ++ if (invokeMe == null) ++ { ++ try { ++ invokeMe = Invocable.class.getMethod( "invoke", String.class, Object[].class ); ++ } catch ( Exception e ) { } ++ } ++ + // install and invoke a method + engine.eval("foo() { return foo+1; }"); + // invoke a method + Invocable invocable = (Invocable) engine; +- int foo = (Integer)invocable.invokeFunction( "foo" ); ++ int foo = (Integer)invokeMe.invoke( invocable, "foo", (Object) new Object[]{} ); + assertTrue( foo == 43 ); + + // get interface +@@ -58,7 +71,7 @@ + engine.eval( + "flag2=false; myObj() { run() { flag2=true; } return this; }"); + assertTrue( (Boolean)engine.get("flag2") == false ); +- Object scriptedObject = invocable.invokeFunction("myObj"); ++ Object scriptedObject = invokeMe.invoke( invocable, "myObj", (Object) new Object[]{} ); + assertTrue( scriptedObject instanceof bsh.This ); + runnable = + (Runnable)invocable.getInterface( scriptedObject, Runnable.class ); diff --git a/external/beanshell/bsh-2.0b1-src.patch b/external/beanshell/bsh-2.0b1-src.patch new file mode 100644 index 000000000..6124f18d1 --- /dev/null +++ b/external/beanshell/bsh-2.0b1-src.patch @@ -0,0 +1,50 @@ +--- misc/BeanShell/build.xml Fri Dec 19 17:14:27 2003 ++++ misc/build/BeanShell/build.xml Fri Mar 28 15:55:04 2008 +@@ -10,7 +10,7 @@ + - Why can't I nest filesets? This seems like it would be so easy and + useful... + --> +-<project name="beanshell" default="compile" basedir="."> ++<project name="beanshell" default="jarall" basedir="."> + + <!-- Project Configuration --> + +@@ -65,6 +65,9 @@ + <property name="exclude-engine" value="bsh/engine/**"/> + --> + ++ <property name="exclude-bsf" ++ value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/> ++ + <!-- Uncomment to build without the ASM class generator code. + <property name="exclude-classgen" + value="bsh/org/objectweb/asm/**,bsh/ClassGeneratorImpl.java,bsh/ClassGeneratorUtil.java,bsh/DelayedEvalBshMethod.java"/> +@@ -75,6 +78,9 @@ + value="bsh/servlet/*"/> + --> + ++ <property name="exclude-servlet" ++ value="bsh/servlet/*"/> ++ + <!-- Legacy excludes. Comment this *out* to build these legacy items --> + <property name="excludes-legacy" + value="bsh/JThis.java"/> +--- misc/BeanShell/src/bsh/classpath/BshClassPath.java 2003-12-19 17:14:28.000000000 +0100 ++++ misc/build/BeanShell/src/bsh/classpath/BshClassPath.java 2014-07-22 21:02:52.000000000 +0200 +@@ -36,6 +36,7 @@ + import bsh.StringUtil; + import bsh.ClassPathException; + import java.lang.ref.WeakReference; ++import java.lang.SecurityException; + import bsh.NameSource; + + /** +@@ -659,6 +660,8 @@ + URL url = new File( rtjar ).toURI().toURL(); + bootClassPath = new BshClassPath( + "Boot Class Path", new URL[] { url } ); ++ } catch ( SecurityException e ) { ++ throw new ClassPathException(" can't access to boot jar: "+e); + } catch ( MalformedURLException e ) { + throw new ClassPathException(" can't find boot jar: "+e); + } diff --git a/external/beanshell/java9.patch.0 b/external/beanshell/java9.patch.0 new file mode 100644 index 000000000..824e54286 --- /dev/null +++ b/external/beanshell/java9.patch.0 @@ -0,0 +1,25 @@ +--- build.xml ++++ build.xml +@@ -176,7 +176,6 @@ + deprecation="${deprecation}" + optimize="on" + debug="on" +- target="1.5" + includes="**/*.java" + excludes="${excludes},**/bak/**" + > +--- src/bsh/util/AWTConsole.java ++++ src/bsh/util/AWTConsole.java +@@ -214,8 +214,11 @@ + Great. What a piece of crap. + */ + public void setCaretPosition( int pos ) { +- ((java.awt.peer.TextComponentPeer)getPeer()).setCaretPosition( ++ try { ++ ((java.awt.peer.TextComponentPeer)getClass().getMethod("getPeer").invoke(this, null)).setCaretPosition( + pos + countNLs() ); ++ } catch (Exception e) { ++ } + } + + /* diff --git a/external/bluez_bluetooth/README b/external/bluez_bluetooth/README new file mode 100644 index 000000000..6668cc4d6 --- /dev/null +++ b/external/bluez_bluetooth/README @@ -0,0 +1,4 @@ +Cleaned linux bluez headers. + +Originally gotten from: +http://gitorious.org/0xdroid/system_bluetooth/trees/59ca0be6dc8ef3f30f8f863d8fb805a55bf12fe5/bluez-clean-headers diff --git a/external/bluez_bluetooth/inc/bluetooth/bluetooth.h b/external/bluez_bluetooth/inc/bluetooth/bluetooth.h new file mode 100644 index 000000000..a2b88e71b --- /dev/null +++ b/external/bluez_bluetooth/inc/bluetooth/bluetooth.h @@ -0,0 +1,70 @@ +/**************************************************************************** + **************************************************************************** + *** + *** This header was automatically generated from a Bluez header + *** of the same name, to make information necessary for userspace to + *** call into the kernel available to Android. It contains only constants, + *** structures, and macros generated from the original header, and thus, + *** contains no copyrightable information. + *** + **************************************************************************** + ****************************************************************************/ +#ifndef __BLUETOOTH_H +#define __BLUETOOTH_H + +#ifdef __cplusplus +#endif +#include <stdio.h> +#include <stdint.h> +#include <string.h> +#include <endian.h> +#include <byteswap.h> +#ifndef AF_BLUETOOTH +#define AF_BLUETOOTH 31 +#define PF_BLUETOOTH AF_BLUETOOTH +#endif +#ifndef SOL_BLUETOOTH +#define SOL_BLUETOOTH 274 +#endif +#define BTPROTO_L2CAP 0 +#define BTPROTO_HCI 1 +#define BTPROTO_SCO 2 +#define BTPROTO_RFCOMM 3 +#define BTPROTO_BNEP 4 +#define BTPROTO_CMTP 5 +#define BTPROTO_HIDP 6 +#define BTPROTO_AVDTP 7 +#define SOL_HCI 0 +#define SOL_L2CAP 6 +#define SOL_SCO 17 +#define SOL_RFCOMM 18 +#if __BYTE_ORDER == __LITTLE_ENDIAN +#define htobs(d) (d) +#define htobl(d) (d) +#define btohs(d) (d) +#define btohl(d) (d) +#elif __BYTE_ORDER == __BIG_ENDIAN +#define htobs(d) bswap_16(d) +#define htobl(d) bswap_32(d) +#define btohs(d) bswap_16(d) +#define btohl(d) bswap_32(d) +#else +#error "Unknown byte order" +#endif +#define bt_get_unaligned(ptr) ({ struct __attribute__((packed)) { typeof(*(ptr)) __v; } *__p = (void *) (ptr); __p->__v; }) +#define bt_put_unaligned(val, ptr) do { struct __attribute__((packed)) { typeof(*(ptr)) __v; } *__p = (void *) (ptr); __p->__v = (val); } while(0) +#define BDADDR_ANY (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}}) +#define BDADDR_ALL (&(bdaddr_t) {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}}) +#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}}) +#ifdef __cplusplus +#endif +typedef struct +{ + uint8_t b[6]; +} __attribute__ ((packed)) bdaddr_t; +static inline void +bacpy (bdaddr_t * dst, const bdaddr_t * src) +{ + memcpy (dst, src, sizeof (bdaddr_t)); +} +#endif diff --git a/external/bluez_bluetooth/inc/bluetooth/hci.h b/external/bluez_bluetooth/inc/bluetooth/hci.h new file mode 100644 index 000000000..3b78f4b5f --- /dev/null +++ b/external/bluez_bluetooth/inc/bluetooth/hci.h @@ -0,0 +1,718 @@ +/**************************************************************************** + **************************************************************************** + *** + *** This header was automatically generated from a Bluez header + *** of the same name, to make information necessary for userspace to + *** call into the kernel available to Android. It contains only constants, + *** structures, and macros generated from the original header, and thus, + *** contains no copyrightable information. + *** + **************************************************************************** + ****************************************************************************/ +#ifndef __HCI_H +#define __HCI_H + +#ifdef __cplusplus +#endif +#include <sys/socket.h> +#include <sys/ioctl.h> +#define HCI_MAX_DEV 16 +#define HCI_MAX_ACL_SIZE 1024 +#define HCI_MAX_SCO_SIZE 255 +#define HCI_MAX_EVENT_SIZE 260 +#define HCI_MAX_FRAME_SIZE (HCI_MAX_ACL_SIZE + 4) +#define HCI_DEV_REG 1 +#define HCI_DEV_UNREG 2 +#define HCI_DEV_UP 3 +#define HCI_DEV_DOWN 4 +#define HCI_DEV_SUSPEND 5 +#define HCI_DEV_RESUME 6 +#define HCI_VIRTUAL 0 +#define HCI_USB 1 +#define HCI_PCCARD 2 +#define HCI_UART 3 +#define HCI_RS232 4 +#define HCI_PCI 5 +#define HCI_SDIO 6 +#define HCIDEVUP _IOW('H', 201, int) +#define HCIDEVDOWN _IOW('H', 202, int) +#define HCIDEVRESET _IOW('H', 203, int) +#define HCIDEVRESTAT _IOW('H', 204, int) +#define HCIGETDEVLIST _IOR('H', 210, int) +#define HCIGETDEVINFO _IOR('H', 211, int) +#define HCIGETCONNLIST _IOR('H', 212, int) +#define HCIGETCONNINFO _IOR('H', 213, int) +#define HCIGETAUTHINFO _IOR('H', 215, int) +#define HCISETRAW _IOW('H', 220, int) +#define HCISETSCAN _IOW('H', 221, int) +#define HCISETAUTH _IOW('H', 222, int) +#define HCISETENCRYPT _IOW('H', 223, int) +#define HCISETPTYPE _IOW('H', 224, int) +#define HCISETLINKPOL _IOW('H', 225, int) +#define HCISETLINKMODE _IOW('H', 226, int) +#define HCISETACLMTU _IOW('H', 227, int) +#define HCISETSCOMTU _IOW('H', 228, int) +#define HCISETSECMGR _IOW('H', 230, int) +#define HCIINQUIRY _IOR('H', 240, int) +#ifndef __NO_HCI_DEFS +#define HCI_COMMAND_PKT 0x01 +#define HCI_ACLDATA_PKT 0x02 +#define HCI_SCODATA_PKT 0x03 +#define HCI_EVENT_PKT 0x04 +#define HCI_VENDOR_PKT 0xff +#define HCI_2DH1 0x0002 +#define HCI_3DH1 0x0004 +#define HCI_DM1 0x0008 +#define HCI_DH1 0x0010 +#define HCI_2DH3 0x0100 +#define HCI_3DH3 0x0200 +#define HCI_DM3 0x0400 +#define HCI_DH3 0x0800 +#define HCI_2DH5 0x1000 +#define HCI_3DH5 0x2000 +#define HCI_DM5 0x4000 +#define HCI_DH5 0x8000 +#define HCI_HV1 0x0020 +#define HCI_HV2 0x0040 +#define HCI_HV3 0x0080 +#define HCI_EV3 0x0008 +#define HCI_EV4 0x0010 +#define HCI_EV5 0x0020 +#define HCI_2EV3 0x0040 +#define HCI_3EV3 0x0080 +#define HCI_2EV5 0x0100 +#define HCI_3EV5 0x0200 +#define SCO_PTYPE_MASK (HCI_HV1 | HCI_HV2 | HCI_HV3) +#define ACL_PTYPE_MASK (HCI_DM1 | HCI_DH1 | HCI_DM3 | HCI_DH3 | HCI_DM5 | HCI_DH5) +#define ESCO_HV1 0x0001 +#define ESCO_HV2 0x0002 +#define ESCO_HV3 0x0004 +#define ESCO_EV3 0x0008 +#define ESCO_EV4 0x0010 +#define ESCO_EV5 0x0020 +#define ESCO_2EV3 0x0040 +#define ESCO_3EV3 0x0080 +#define ESCO_2EV5 0x0100 +#define ESCO_3EV5 0x0200 +#define SCO_ESCO_MASK (ESCO_HV1 | ESCO_HV2 | ESCO_HV3) +#define EDR_ESCO_MASK (ESCO_2EV3 | ESCO_3EV3 | ESCO_2EV5 | ESCO_3EV5) +#define ALL_ESCO_MASK (SCO_ESCO_MASK | ESCO_EV3 | ESCO_EV4 | ESCO_EV5 | EDR_ESCO_MASK) +#define HCI_UNKNOWN_COMMAND 0x01 +#define HCI_NO_CONNECTION 0x02 +#define HCI_HARDWARE_FAILURE 0x03 +#define HCI_PAGE_TIMEOUT 0x04 +#define HCI_AUTHENTICATION_FAILURE 0x05 +#define HCI_PIN_OR_KEY_MISSING 0x06 +#define HCI_MEMORY_FULL 0x07 +#define HCI_CONNECTION_TIMEOUT 0x08 +#define HCI_MAX_NUMBER_OF_CONNECTIONS 0x09 +#define HCI_MAX_NUMBER_OF_SCO_CONNECTIONS 0x0a +#define HCI_ACL_CONNECTION_EXISTS 0x0b +#define HCI_COMMAND_DISALLOWED 0x0c +#define HCI_REJECTED_LIMITED_RESOURCES 0x0d +#define HCI_REJECTED_SECURITY 0x0e +#define HCI_REJECTED_PERSONAL 0x0f +#define HCI_HOST_TIMEOUT 0x10 +#define HCI_UNSUPPORTED_FEATURE 0x11 +#define HCI_INVALID_PARAMETERS 0x12 +#define HCI_OE_USER_ENDED_CONNECTION 0x13 +#define HCI_OE_LOW_RESOURCES 0x14 +#define HCI_OE_POWER_OFF 0x15 +#define HCI_CONNECTION_TERMINATED 0x16 +#define HCI_REPEATED_ATTEMPTS 0x17 +#define HCI_PAIRING_NOT_ALLOWED 0x18 +#define HCI_UNKNOWN_LMP_PDU 0x19 +#define HCI_UNSUPPORTED_REMOTE_FEATURE 0x1a +#define HCI_SCO_OFFSET_REJECTED 0x1b +#define HCI_SCO_INTERVAL_REJECTED 0x1c +#define HCI_AIR_MODE_REJECTED 0x1d +#define HCI_INVALID_LMP_PARAMETERS 0x1e +#define HCI_UNSPECIFIED_ERROR 0x1f +#define HCI_UNSUPPORTED_LMP_PARAMETER_VALUE 0x20 +#define HCI_ROLE_CHANGE_NOT_ALLOWED 0x21 +#define HCI_LMP_RESPONSE_TIMEOUT 0x22 +#define HCI_LMP_ERROR_TRANSACTION_COLLISION 0x23 +#define HCI_LMP_PDU_NOT_ALLOWED 0x24 +#define HCI_ENCRYPTION_MODE_NOT_ACCEPTED 0x25 +#define HCI_UNIT_LINK_KEY_USED 0x26 +#define HCI_QOS_NOT_SUPPORTED 0x27 +#define HCI_INSTANT_PASSED 0x28 +#define HCI_PAIRING_NOT_SUPPORTED 0x29 +#define HCI_TRANSACTION_COLLISION 0x2a +#define HCI_QOS_UNACCEPTABLE_PARAMETER 0x2c +#define HCI_QOS_REJECTED 0x2d +#define HCI_CLASSIFICATION_NOT_SUPPORTED 0x2e +#define HCI_INSUFFICIENT_SECURITY 0x2f +#define HCI_PARAMETER_OUT_OF_RANGE 0x30 +#define HCI_ROLE_SWITCH_PENDING 0x32 +#define HCI_SLOT_VIOLATION 0x34 +#define HCI_ROLE_SWITCH_FAILED 0x35 +#define HCI_EIR_TOO_LARGE 0x36 +#define HCI_SIMPLE_PAIRING_NOT_SUPPORTED 0x37 +#define HCI_HOST_BUSY_PAIRING 0x38 +#define ACL_CONT 0x01 +#define ACL_START 0x02 +#define ACL_ACTIVE_BCAST 0x04 +#define ACL_PICO_BCAST 0x08 +#define SCO_LINK 0x00 +#define ACL_LINK 0x01 +#define ESCO_LINK 0x02 +#define LMP_3SLOT 0x01 +#define LMP_5SLOT 0x02 +#define LMP_ENCRYPT 0x04 +#define LMP_SOFFSET 0x08 +#define LMP_TACCURACY 0x10 +#define LMP_RSWITCH 0x20 +#define LMP_HOLD 0x40 +#define LMP_SNIFF 0x80 +#define LMP_PARK 0x01 +#define LMP_RSSI 0x02 +#define LMP_QUALITY 0x04 +#define LMP_SCO 0x08 +#define LMP_HV2 0x10 +#define LMP_HV3 0x20 +#define LMP_ULAW 0x40 +#define LMP_ALAW 0x80 +#define LMP_CVSD 0x01 +#define LMP_PSCHEME 0x02 +#define LMP_PCONTROL 0x04 +#define LMP_TRSP_SCO 0x08 +#define LMP_BCAST_ENC 0x80 +#define LMP_EDR_ACL_2M 0x02 +#define LMP_EDR_ACL_3M 0x04 +#define LMP_ENH_ISCAN 0x08 +#define LMP_ILACE_ISCAN 0x10 +#define LMP_ILACE_PSCAN 0x20 +#define LMP_RSSI_INQ 0x40 +#define LMP_ESCO 0x80 +#define LMP_EV4 0x01 +#define LMP_EV5 0x02 +#define LMP_AFH_CAP_SLV 0x08 +#define LMP_AFH_CLS_SLV 0x10 +#define LMP_EDR_3SLOT 0x80 +#define LMP_EDR_5SLOT 0x01 +#define LMP_SNIFF_SUBR 0x02 +#define LMP_PAUSE_ENC 0x04 +#define LMP_AFH_CAP_MST 0x08 +#define LMP_AFH_CLS_MST 0x10 +#define LMP_EDR_ESCO_2M 0x20 +#define LMP_EDR_ESCO_3M 0x40 +#define LMP_EDR_3S_ESCO 0x80 +#define LMP_EXT_INQ 0x01 +#define LMP_SIMPLE_PAIR 0x08 +#define LMP_ENCAPS_PDU 0x10 +#define LMP_ERR_DAT_REP 0x20 +#define LMP_NFLUSH_PKTS 0x40 +#define LMP_LSTO 0x01 +#define LMP_INQ_TX_PWR 0x02 +#define LMP_EXT_FEAT 0x80 +#define HCI_LP_RSWITCH 0x0001 +#define HCI_LP_HOLD 0x0002 +#define HCI_LP_SNIFF 0x0004 +#define HCI_LP_PARK 0x0008 +#define HCI_LM_ACCEPT 0x8000 +#define HCI_LM_MASTER 0x0001 +#define HCI_LM_AUTH 0x0002 +#define HCI_LM_ENCRYPT 0x0004 +#define HCI_LM_TRUSTED 0x0008 +#define HCI_LM_RELIABLE 0x0010 +#define HCI_LM_SECURE 0x0020 +#define OGF_LINK_CTL 0x01 +#define OCF_INQUIRY 0x0001 +#define INQUIRY_CP_SIZE 5 +#define STATUS_BDADDR_RP_SIZE 7 +#define OCF_INQUIRY_CANCEL 0x0002 +#define OCF_PERIODIC_INQUIRY 0x0003 +#define PERIODIC_INQUIRY_CP_SIZE 9 +#define OCF_EXIT_PERIODIC_INQUIRY 0x0004 +#define OCF_CREATE_CONN 0x0005 +#define CREATE_CONN_CP_SIZE 13 +#define OCF_DISCONNECT 0x0006 +#define DISCONNECT_CP_SIZE 3 +#define OCF_ADD_SCO 0x0007 +#define ADD_SCO_CP_SIZE 4 +#define OCF_CREATE_CONN_CANCEL 0x0008 +#define CREATE_CONN_CANCEL_CP_SIZE 6 +#define OCF_ACCEPT_CONN_REQ 0x0009 +#define ACCEPT_CONN_REQ_CP_SIZE 7 +#define OCF_REJECT_CONN_REQ 0x000A +#define REJECT_CONN_REQ_CP_SIZE 7 +#define OCF_LINK_KEY_REPLY 0x000B +#define LINK_KEY_REPLY_CP_SIZE 22 +#define OCF_LINK_KEY_NEG_REPLY 0x000C +#define OCF_PIN_CODE_REPLY 0x000D +#define PIN_CODE_REPLY_CP_SIZE 23 +#define OCF_PIN_CODE_NEG_REPLY 0x000E +#define OCF_SET_CONN_PTYPE 0x000F +#define SET_CONN_PTYPE_CP_SIZE 4 +#define OCF_AUTH_REQUESTED 0x0011 +#define AUTH_REQUESTED_CP_SIZE 2 +#define OCF_SET_CONN_ENCRYPT 0x0013 +#define SET_CONN_ENCRYPT_CP_SIZE 3 +#define OCF_CHANGE_CONN_LINK_KEY 0x0015 +#define CHANGE_CONN_LINK_KEY_CP_SIZE 2 +#define OCF_MASTER_LINK_KEY 0x0017 +#define MASTER_LINK_KEY_CP_SIZE 1 +#define OCF_REMOTE_NAME_REQ 0x0019 +#define REMOTE_NAME_REQ_CP_SIZE 10 +#define OCF_REMOTE_NAME_REQ_CANCEL 0x001A +#define REMOTE_NAME_REQ_CANCEL_CP_SIZE 6 +#define OCF_READ_REMOTE_FEATURES 0x001B +#define READ_REMOTE_FEATURES_CP_SIZE 2 +#define OCF_READ_REMOTE_EXT_FEATURES 0x001C +#define READ_REMOTE_EXT_FEATURES_CP_SIZE 3 +#define OCF_READ_REMOTE_VERSION 0x001D +#define READ_REMOTE_VERSION_CP_SIZE 2 +#define OCF_READ_CLOCK_OFFSET 0x001F +#define READ_CLOCK_OFFSET_CP_SIZE 2 +#define OCF_READ_LMP_HANDLE 0x0020 +#define OCF_SETUP_SYNC_CONN 0x0028 +#define SETUP_SYNC_CONN_CP_SIZE 17 +#define OCF_ACCEPT_SYNC_CONN_REQ 0x0029 +#define ACCEPT_SYNC_CONN_REQ_CP_SIZE 21 +#define OCF_REJECT_SYNC_CONN_REQ 0x002A +#define REJECT_SYNC_CONN_REQ_CP_SIZE 7 +#define OCF_IO_CAPABILITY_REPLY 0x002B +#define IO_CAPABILITY_REPLY_CP_SIZE 9 +#define OCF_USER_CONFIRM_REPLY 0x002C +#define USER_CONFIRM_REPLY_CP_SIZE 6 +#define OCF_USER_CONFIRM_NEG_REPLY 0x002D +#define OCF_USER_PASSKEY_REPLY 0x002E +#define USER_PASSKEY_REPLY_CP_SIZE 10 +#define OCF_USER_PASSKEY_NEG_REPLY 0x002F +#define OCF_REMOTE_OOB_DATA_REPLY 0x0030 +#define REMOTE_OOB_DATA_REPLY_CP_SIZE 38 +#define OCF_REMOTE_OOB_DATA_NEG_REPLY 0x0033 +#define OCF_IO_CAPABILITY_NEG_REPLY 0x0034 +#define IO_CAPABILITY_NEG_REPLY_CP_SIZE 7 +#define OGF_LINK_POLICY 0x02 +#define OCF_HOLD_MODE 0x0001 +#define HOLD_MODE_CP_SIZE 6 +#define OCF_SNIFF_MODE 0x0003 +#define SNIFF_MODE_CP_SIZE 10 +#define OCF_EXIT_SNIFF_MODE 0x0004 +#define EXIT_SNIFF_MODE_CP_SIZE 2 +#define OCF_PARK_MODE 0x0005 +#define PARK_MODE_CP_SIZE 6 +#define OCF_EXIT_PARK_MODE 0x0006 +#define EXIT_PARK_MODE_CP_SIZE 2 +#define OCF_QOS_SETUP 0x0007 +#define HCI_QOS_CP_SIZE 17 +#define QOS_SETUP_CP_SIZE (3 + HCI_QOS_CP_SIZE) +#define OCF_ROLE_DISCOVERY 0x0009 +#define ROLE_DISCOVERY_CP_SIZE 2 +#define ROLE_DISCOVERY_RP_SIZE 4 +#define OCF_SWITCH_ROLE 0x000B +#define SWITCH_ROLE_CP_SIZE 7 +#define OCF_READ_LINK_POLICY 0x000C +#define READ_LINK_POLICY_CP_SIZE 2 +#define READ_LINK_POLICY_RP_SIZE 5 +#define OCF_WRITE_LINK_POLICY 0x000D +#define WRITE_LINK_POLICY_CP_SIZE 4 +#define WRITE_LINK_POLICY_RP_SIZE 3 +#define OCF_READ_DEFAULT_LINK_POLICY 0x000E +#define OCF_WRITE_DEFAULT_LINK_POLICY 0x000F +#define OCF_FLOW_SPECIFICATION 0x0010 +#define OCF_SNIFF_SUBRATING 0x0011 +#define SNIFF_SUBRATING_CP_SIZE 8 +#define OGF_HOST_CTL 0x03 +#define OCF_SET_EVENT_MASK 0x0001 +#define SET_EVENT_MASK_CP_SIZE 8 +#define OCF_RESET 0x0003 +#define OCF_SET_EVENT_FLT 0x0005 +#define SET_EVENT_FLT_CP_SIZE 2 +#define FLT_CLEAR_ALL 0x00 +#define FLT_INQ_RESULT 0x01 +#define FLT_CONN_SETUP 0x02 +#define INQ_RESULT_RETURN_ALL 0x00 +#define INQ_RESULT_RETURN_CLASS 0x01 +#define INQ_RESULT_RETURN_BDADDR 0x02 +#define CONN_SETUP_ALLOW_ALL 0x00 +#define CONN_SETUP_ALLOW_CLASS 0x01 +#define CONN_SETUP_ALLOW_BDADDR 0x02 +#define CONN_SETUP_AUTO_OFF 0x01 +#define CONN_SETUP_AUTO_ON 0x02 +#define OCF_FLUSH 0x0008 +#define OCF_READ_PIN_TYPE 0x0009 +#define READ_PIN_TYPE_RP_SIZE 2 +#define OCF_WRITE_PIN_TYPE 0x000A +#define WRITE_PIN_TYPE_CP_SIZE 1 +#define OCF_CREATE_NEW_UNIT_KEY 0x000B +#define OCF_READ_STORED_LINK_KEY 0x000D +#define READ_STORED_LINK_KEY_CP_SIZE 7 +#define READ_STORED_LINK_KEY_RP_SIZE 5 +#define OCF_WRITE_STORED_LINK_KEY 0x0011 +#define WRITE_STORED_LINK_KEY_CP_SIZE 1 +#define READ_WRITE_LINK_KEY_RP_SIZE 2 +#define OCF_DELETE_STORED_LINK_KEY 0x0012 +#define DELETE_STORED_LINK_KEY_CP_SIZE 7 +#define DELETE_STORED_LINK_KEY_RP_SIZE 3 +#define OCF_CHANGE_LOCAL_NAME 0x0013 +#define CHANGE_LOCAL_NAME_CP_SIZE 248 +#define OCF_READ_LOCAL_NAME 0x0014 +#define READ_LOCAL_NAME_RP_SIZE 249 +#define OCF_READ_CONN_ACCEPT_TIMEOUT 0x0015 +#define READ_CONN_ACCEPT_TIMEOUT_RP_SIZE 3 +#define OCF_WRITE_CONN_ACCEPT_TIMEOUT 0x0016 +#define WRITE_CONN_ACCEPT_TIMEOUT_CP_SIZE 2 +#define OCF_READ_PAGE_TIMEOUT 0x0017 +#define READ_PAGE_TIMEOUT_RP_SIZE 3 +#define OCF_WRITE_PAGE_TIMEOUT 0x0018 +#define WRITE_PAGE_TIMEOUT_CP_SIZE 2 +#define OCF_READ_SCAN_ENABLE 0x0019 +#define READ_SCAN_ENABLE_RP_SIZE 2 +#define OCF_WRITE_SCAN_ENABLE 0x001A +#define SCAN_DISABLED 0x00 +#define SCAN_INQUIRY 0x01 +#define SCAN_PAGE 0x02 +#define OCF_READ_PAGE_ACTIVITY 0x001B +#define READ_PAGE_ACTIVITY_RP_SIZE 5 +#define OCF_WRITE_PAGE_ACTIVITY 0x001C +#define WRITE_PAGE_ACTIVITY_CP_SIZE 4 +#define OCF_READ_INQ_ACTIVITY 0x001D +#define READ_INQ_ACTIVITY_RP_SIZE 5 +#define OCF_WRITE_INQ_ACTIVITY 0x001E +#define WRITE_INQ_ACTIVITY_CP_SIZE 4 +#define OCF_READ_AUTH_ENABLE 0x001F +#define OCF_WRITE_AUTH_ENABLE 0x0020 +#define AUTH_DISABLED 0x00 +#define AUTH_ENABLED 0x01 +#define OCF_READ_ENCRYPT_MODE 0x0021 +#define OCF_WRITE_ENCRYPT_MODE 0x0022 +#define ENCRYPT_DISABLED 0x00 +#define ENCRYPT_P2P 0x01 +#define ENCRYPT_BOTH 0x02 +#define OCF_READ_CLASS_OF_DEV 0x0023 +#define READ_CLASS_OF_DEV_RP_SIZE 4 +#define OCF_WRITE_CLASS_OF_DEV 0x0024 +#define WRITE_CLASS_OF_DEV_CP_SIZE 3 +#define OCF_READ_VOICE_SETTING 0x0025 +#define READ_VOICE_SETTING_RP_SIZE 3 +#define OCF_WRITE_VOICE_SETTING 0x0026 +#define WRITE_VOICE_SETTING_CP_SIZE 2 +#define OCF_READ_AUTOMATIC_FLUSH_TIMEOUT 0x0027 +#define OCF_WRITE_AUTOMATIC_FLUSH_TIMEOUT 0x0028 +#define OCF_READ_NUM_BROADCAST_RETRANS 0x0029 +#define OCF_WRITE_NUM_BROADCAST_RETRANS 0x002A +#define OCF_READ_HOLD_MODE_ACTIVITY 0x002B +#define OCF_WRITE_HOLD_MODE_ACTIVITY 0x002C +#define OCF_READ_TRANSMIT_POWER_LEVEL 0x002D +#define READ_TRANSMIT_POWER_LEVEL_CP_SIZE 3 +#define READ_TRANSMIT_POWER_LEVEL_RP_SIZE 4 +#define OCF_READ_SYNC_FLOW_ENABLE 0x002E +#define OCF_WRITE_SYNC_FLOW_ENABLE 0x002F +#define OCF_SET_CONTROLLER_TO_HOST_FC 0x0031 +#define OCF_HOST_BUFFER_SIZE 0x0033 +#define HOST_BUFFER_SIZE_CP_SIZE 7 +#define OCF_HOST_NUM_COMP_PKTS 0x0035 +#define HOST_NUM_COMP_PKTS_CP_SIZE 1 +#define OCF_READ_LINK_SUPERVISION_TIMEOUT 0x0036 +#define READ_LINK_SUPERVISION_TIMEOUT_RP_SIZE 5 +#define OCF_WRITE_LINK_SUPERVISION_TIMEOUT 0x0037 +#define WRITE_LINK_SUPERVISION_TIMEOUT_CP_SIZE 4 +#define WRITE_LINK_SUPERVISION_TIMEOUT_RP_SIZE 3 +#define OCF_READ_NUM_SUPPORTED_IAC 0x0038 +#define MAX_IAC_LAP 0x40 +#define OCF_READ_CURRENT_IAC_LAP 0x0039 +#define READ_CURRENT_IAC_LAP_RP_SIZE 2+3*MAX_IAC_LAP +#define OCF_WRITE_CURRENT_IAC_LAP 0x003A +#define WRITE_CURRENT_IAC_LAP_CP_SIZE 1+3*MAX_IAC_LAP +#define OCF_READ_PAGE_SCAN_PERIOD_MODE 0x003B +#define OCF_WRITE_PAGE_SCAN_PERIOD_MODE 0x003C +#define OCF_READ_PAGE_SCAN_MODE 0x003D +#define OCF_WRITE_PAGE_SCAN_MODE 0x003E +#define OCF_SET_AFH_CLASSIFICATION 0x003F +#define SET_AFH_CLASSIFICATION_CP_SIZE 10 +#define SET_AFH_CLASSIFICATION_RP_SIZE 1 +#define OCF_READ_INQUIRY_SCAN_TYPE 0x0042 +#define READ_INQUIRY_SCAN_TYPE_RP_SIZE 2 +#define OCF_WRITE_INQUIRY_SCAN_TYPE 0x0043 +#define WRITE_INQUIRY_SCAN_TYPE_CP_SIZE 1 +#define WRITE_INQUIRY_SCAN_TYPE_RP_SIZE 1 +#define OCF_READ_INQUIRY_MODE 0x0044 +#define READ_INQUIRY_MODE_RP_SIZE 2 +#define OCF_WRITE_INQUIRY_MODE 0x0045 +#define WRITE_INQUIRY_MODE_CP_SIZE 1 +#define WRITE_INQUIRY_MODE_RP_SIZE 1 +#define OCF_READ_PAGE_SCAN_TYPE 0x0046 +#define OCF_WRITE_PAGE_SCAN_TYPE 0x0047 +#define OCF_READ_AFH_MODE 0x0048 +#define READ_AFH_MODE_RP_SIZE 2 +#define OCF_WRITE_AFH_MODE 0x0049 +#define WRITE_AFH_MODE_CP_SIZE 1 +#define WRITE_AFH_MODE_RP_SIZE 1 +#define OCF_READ_EXT_INQUIRY_RESPONSE 0x0051 +#define READ_EXT_INQUIRY_RESPONSE_RP_SIZE 242 +#define OCF_WRITE_EXT_INQUIRY_RESPONSE 0x0052 +#define WRITE_EXT_INQUIRY_RESPONSE_CP_SIZE 241 +#define WRITE_EXT_INQUIRY_RESPONSE_RP_SIZE 1 +#define OCF_REFRESH_ENCRYPTION_KEY 0x0053 +#define REFRESH_ENCRYPTION_KEY_CP_SIZE 2 +#define REFRESH_ENCRYPTION_KEY_RP_SIZE 1 +#define OCF_READ_SIMPLE_PAIRING_MODE 0x0055 +#define READ_SIMPLE_PAIRING_MODE_RP_SIZE 2 +#define OCF_WRITE_SIMPLE_PAIRING_MODE 0x0056 +#define WRITE_SIMPLE_PAIRING_MODE_CP_SIZE 1 +#define WRITE_SIMPLE_PAIRING_MODE_RP_SIZE 1 +#define OCF_READ_LOCAL_OOB_DATA 0x0057 +#define READ_LOCAL_OOB_DATA_RP_SIZE 33 +#define OCF_READ_INQUIRY_TRANSMIT_POWER_LEVEL 0x0058 +#define READ_INQUIRY_TRANSMIT_POWER_LEVEL_RP_SIZE 2 +#define OCF_WRITE_INQUIRY_TRANSMIT_POWER_LEVEL 0x0059 +#define WRITE_INQUIRY_TRANSMIT_POWER_LEVEL_CP_SIZE 1 +#define WRITE_INQUIRY_TRANSMIT_POWER_LEVEL_RP_SIZE 1 +#define OCF_READ_DEFAULT_ERROR_DATA_REPORTING 0x005A +#define READ_DEFAULT_ERROR_DATA_REPORTING_RP_SIZE 2 +#define OCF_WRITE_DEFAULT_ERROR_DATA_REPORTING 0x005B +#define WRITE_DEFAULT_ERROR_DATA_REPORTING_CP_SIZE 1 +#define WRITE_DEFAULT_ERROR_DATA_REPORTING_RP_SIZE 1 +#define OCF_ENHANCED_FLUSH 0x005F +#define ENHANCED_FLUSH_CP_SIZE 3 +#define OCF_SEND_KEYPRESS_NOTIFY 0x0060 +#define SEND_KEYPRESS_NOTIFY_CP_SIZE 7 +#define SEND_KEYPRESS_NOTIFY_RP_SIZE 1 +#define OGF_INFO_PARAM 0x04 +#define OCF_READ_LOCAL_VERSION 0x0001 +#define READ_LOCAL_VERSION_RP_SIZE 9 +#define OCF_READ_LOCAL_COMMANDS 0x0002 +#define READ_LOCAL_COMMANDS_RP_SIZE 65 +#define OCF_READ_LOCAL_FEATURES 0x0003 +#define READ_LOCAL_FEATURES_RP_SIZE 9 +#define OCF_READ_LOCAL_EXT_FEATURES 0x0004 +#define READ_LOCAL_EXT_FEATURES_CP_SIZE 1 +#define READ_LOCAL_EXT_FEATURES_RP_SIZE 11 +#define OCF_READ_BUFFER_SIZE 0x0005 +#define READ_BUFFER_SIZE_RP_SIZE 8 +#define OCF_READ_COUNTRY_CODE 0x0007 +#define OCF_READ_BD_ADDR 0x0009 +#define READ_BD_ADDR_RP_SIZE 7 +#define OGF_STATUS_PARAM 0x05 +#define OCF_READ_FAILED_CONTACT_COUNTER 0x0001 +#define READ_FAILED_CONTACT_COUNTER_RP_SIZE 4 +#define OCF_RESET_FAILED_CONTACT_COUNTER 0x0002 +#define RESET_FAILED_CONTACT_COUNTER_RP_SIZE 4 +#define OCF_READ_LINK_QUALITY 0x0003 +#define READ_LINK_QUALITY_RP_SIZE 4 +#define OCF_READ_RSSI 0x0005 +#define READ_RSSI_RP_SIZE 4 +#define OCF_READ_AFH_MAP 0x0006 +#define READ_AFH_MAP_RP_SIZE 14 +#define OCF_READ_CLOCK 0x0007 +#define READ_CLOCK_CP_SIZE 3 +#define READ_CLOCK_RP_SIZE 9 +#define OGF_TESTING_CMD 0x3e +#define OCF_READ_LOOPBACK_MODE 0x0001 +#define OCF_WRITE_LOOPBACK_MODE 0x0002 +#define OCF_ENABLE_DEVICE_UNDER_TEST_MODE 0x0003 +#define OCF_WRITE_SIMPLE_PAIRING_DEBUG_MODE 0x0004 +#define WRITE_SIMPLE_PAIRING_DEBUG_MODE_CP_SIZE 1 +#define WRITE_SIMPLE_PAIRING_DEBUG_MODE_RP_SIZE 1 +#define OGF_VENDOR_CMD 0x3f +#define EVT_INQUIRY_COMPLETE 0x01 +#define EVT_INQUIRY_RESULT 0x02 +#define INQUIRY_INFO_SIZE 14 +#define EVT_CONN_COMPLETE 0x03 +#define EVT_CONN_COMPLETE_SIZE 13 +#define EVT_CONN_REQUEST 0x04 +#define EVT_CONN_REQUEST_SIZE 10 +#define EVT_DISCONN_COMPLETE 0x05 +#define EVT_DISCONN_COMPLETE_SIZE 4 +#define EVT_AUTH_COMPLETE 0x06 +#define EVT_AUTH_COMPLETE_SIZE 3 +#define EVT_REMOTE_NAME_REQ_COMPLETE 0x07 +#define EVT_REMOTE_NAME_REQ_COMPLETE_SIZE 255 +#define EVT_ENCRYPT_CHANGE 0x08 +#define EVT_ENCRYPT_CHANGE_SIZE 5 +#define EVT_CHANGE_CONN_LINK_KEY_COMPLETE 0x09 +#define EVT_CHANGE_CONN_LINK_KEY_COMPLETE_SIZE 3 +#define EVT_MASTER_LINK_KEY_COMPLETE 0x0A +#define EVT_MASTER_LINK_KEY_COMPLETE_SIZE 4 +#define EVT_READ_REMOTE_FEATURES_COMPLETE 0x0B +#define EVT_READ_REMOTE_FEATURES_COMPLETE_SIZE 11 +#define EVT_READ_REMOTE_VERSION_COMPLETE 0x0C +#define EVT_READ_REMOTE_VERSION_COMPLETE_SIZE 8 +#define EVT_QOS_SETUP_COMPLETE 0x0D +#define EVT_QOS_SETUP_COMPLETE_SIZE (4 + HCI_QOS_CP_SIZE) +#define EVT_CMD_COMPLETE 0x0E +#define EVT_CMD_COMPLETE_SIZE 3 +#define EVT_CMD_STATUS 0x0F +#define EVT_CMD_STATUS_SIZE 4 +#define EVT_HARDWARE_ERROR 0x10 +#define EVT_HARDWARE_ERROR_SIZE 1 +#define EVT_FLUSH_OCCURRED 0x11 +#define EVT_FLUSH_OCCURRED_SIZE 2 +#define EVT_ROLE_CHANGE 0x12 +#define EVT_ROLE_CHANGE_SIZE 8 +#define EVT_NUM_COMP_PKTS 0x13 +#define EVT_NUM_COMP_PKTS_SIZE 1 +#define EVT_MODE_CHANGE 0x14 +#define EVT_MODE_CHANGE_SIZE 6 +#define EVT_RETURN_LINK_KEYS 0x15 +#define EVT_RETURN_LINK_KEYS_SIZE 1 +#define EVT_PIN_CODE_REQ 0x16 +#define EVT_PIN_CODE_REQ_SIZE 6 +#define EVT_LINK_KEY_REQ 0x17 +#define EVT_LINK_KEY_REQ_SIZE 6 +#define EVT_LINK_KEY_NOTIFY 0x18 +#define EVT_LINK_KEY_NOTIFY_SIZE 23 +#define EVT_LOOPBACK_COMMAND 0x19 +#define EVT_DATA_BUFFER_OVERFLOW 0x1A +#define EVT_DATA_BUFFER_OVERFLOW_SIZE 1 +#define EVT_MAX_SLOTS_CHANGE 0x1B +#define EVT_MAX_SLOTS_CHANGE_SIZE 3 +#define EVT_READ_CLOCK_OFFSET_COMPLETE 0x1C +#define EVT_READ_CLOCK_OFFSET_COMPLETE_SIZE 5 +#define EVT_CONN_PTYPE_CHANGED 0x1D +#define EVT_CONN_PTYPE_CHANGED_SIZE 5 +#define EVT_QOS_VIOLATION 0x1E +#define EVT_QOS_VIOLATION_SIZE 2 +#define EVT_PSCAN_REP_MODE_CHANGE 0x20 +#define EVT_PSCAN_REP_MODE_CHANGE_SIZE 7 +#define EVT_FLOW_SPEC_COMPLETE 0x21 +#define EVT_FLOW_SPEC_COMPLETE_SIZE (5 + HCI_QOS_CP_SIZE) +#define EVT_INQUIRY_RESULT_WITH_RSSI 0x22 +#define INQUIRY_INFO_WITH_RSSI_SIZE 14 +#define INQUIRY_INFO_WITH_RSSI_AND_PSCAN_MODE_SIZE 15 +#define EVT_READ_REMOTE_EXT_FEATURES_COMPLETE 0x23 +#define EVT_READ_REMOTE_EXT_FEATURES_COMPLETE_SIZE 13 +#define EVT_SYNC_CONN_COMPLETE 0x2C +#define EVT_SYNC_CONN_COMPLETE_SIZE 17 +#define EVT_SYNC_CONN_CHANGED 0x2D +#define EVT_SYNC_CONN_CHANGED_SIZE 9 +#define EVT_SNIFF_SUBRATING 0x2E +#define EVT_SNIFF_SUBRATING_SIZE 11 +#define EVT_EXTENDED_INQUIRY_RESULT 0x2F +#define EXTENDED_INQUIRY_INFO_SIZE 254 +#define EVT_ENCRYPTION_KEY_REFRESH_COMPLETE 0x30 +#define EVT_ENCRYPTION_KEY_REFRESH_COMPLETE_SIZE 3 +#define EVT_IO_CAPABILITY_REQUEST 0x31 +#define EVT_IO_CAPABILITY_REQUEST_SIZE 6 +#define EVT_IO_CAPABILITY_RESPONSE 0x32 +#define EVT_IO_CAPABILITY_RESPONSE_SIZE 9 +#define EVT_USER_CONFIRM_REQUEST 0x33 +#define EVT_USER_CONFIRM_REQUEST_SIZE 10 +#define EVT_USER_PASSKEY_REQUEST 0x34 +#define EVT_USER_PASSKEY_REQUEST_SIZE 6 +#define EVT_REMOTE_OOB_DATA_REQUEST 0x35 +#define EVT_REMOTE_OOB_DATA_REQUEST_SIZE 6 +#define EVT_SIMPLE_PAIRING_COMPLETE 0x36 +#define EVT_SIMPLE_PAIRING_COMPLETE_SIZE 7 +#define EVT_LINK_SUPERVISION_TIMEOUT_CHANGED 0x38 +#define EVT_LINK_SUPERVISION_TIMEOUT_CHANGED_SIZE 4 +#define EVT_ENHANCED_FLUSH_COMPLETE 0x39 +#define EVT_ENHANCED_FLUSH_COMPLETE_SIZE 2 +#define EVT_USER_PASSKEY_NOTIFY 0x3B +#define EVT_USER_PASSKEY_NOTIFY_SIZE 10 +#define EVT_KEYPRESS_NOTIFY 0x3C +#define EVT_KEYPRESS_NOTIFY_SIZE 7 +#define EVT_REMOTE_HOST_FEATURES_NOTIFY 0x3D +#define EVT_REMOTE_HOST_FEATURES_NOTIFY_SIZE 14 +#define EVT_TESTING 0xFE +#define EVT_VENDOR 0xFF +#define EVT_STACK_INTERNAL 0xFD +#define EVT_STACK_INTERNAL_SIZE 2 +#define EVT_SI_DEVICE 0x01 +#define EVT_SI_DEVICE_SIZE 4 +#define EVT_SI_SECURITY 0x02 +#define HCI_TYPE_LEN 1 +#define HCI_COMMAND_HDR_SIZE 3 +#define HCI_EVENT_HDR_SIZE 2 +#define HCI_ACL_HDR_SIZE 4 +#define HCI_SCO_HDR_SIZE 3 +#define HCI_MSG_HDR_SIZE 6 +#define cmd_opcode_pack(ogf, ocf) (uint16_t)((ocf & 0x03ff)|(ogf << 10)) +#define cmd_opcode_ogf(op) (op >> 10) +#define cmd_opcode_ocf(op) (op & 0x03ff) +#define acl_handle_pack(h, f) (uint16_t)((h & 0x0fff)|(f << 12)) +#define acl_handle(h) (h & 0x0fff) +#define acl_flags(h) (h >> 12) +#endif +#define HCI_DATA_DIR 1 +#define HCI_FILTER 2 +#define HCI_TIME_STAMP 3 +#define HCI_CMSG_DIR 0x0001 +#define HCI_CMSG_TSTAMP 0x0002 +#define HCI_DEV_NONE 0xffff +#define HCI_FLT_TYPE_BITS 31 +#define HCI_FLT_EVENT_BITS 63 +#define HCI_FLT_OGF_BITS 63 +#define HCI_FLT_OCF_BITS 127 +#define IREQ_CACHE_FLUSH 0x0001 +#ifdef __cplusplus +#endif +struct hci_dev_stats +{ + uint32_t err_rx; + uint32_t err_tx; + uint32_t cmd_tx; + uint32_t evt_rx; + uint32_t acl_tx; + uint32_t acl_rx; + uint32_t sco_tx; + uint32_t sco_rx; + uint32_t byte_rx; + uint32_t byte_tx; +}; +struct hci_dev_info +{ + uint16_t dev_id; + char name[8]; + + bdaddr_t bdaddr; + + uint32_t flags; + uint8_t type; + + uint8_t features[8]; + + uint32_t pkt_type; + uint32_t link_policy; + uint32_t link_mode; + + uint16_t acl_mtu; + uint16_t acl_pkts; + uint16_t sco_mtu; + uint16_t sco_pkts; + + struct hci_dev_stats stat; +}; +enum +{ + HCI_UP, + HCI_INIT, + HCI_RUNNING, + + HCI_PSCAN, + HCI_ISCAN, + HCI_AUTH, + HCI_ENCRYPT, + HCI_INQUIRY, + + HCI_RAW, + + HCI_SECMGR +}; +struct sockaddr_hci +{ + sa_family_t hci_family; + unsigned short hci_dev; +}; +struct hci_conn_info +{ + uint16_t handle; + bdaddr_t bdaddr; + uint8_t type; + uint8_t out; + uint16_t state; + uint32_t link_mode; + uint32_t mtu; + uint32_t cnt; + uint32_t pkts; +}; +struct hci_conn_list_req +{ + uint16_t dev_id; + uint16_t conn_num; + struct hci_conn_info conn_info[0]; +}; +#endif diff --git a/external/bluez_bluetooth/inc/bluetooth/hci_lib.h b/external/bluez_bluetooth/inc/bluetooth/hci_lib.h new file mode 100644 index 000000000..ef290bc45 --- /dev/null +++ b/external/bluez_bluetooth/inc/bluetooth/hci_lib.h @@ -0,0 +1,24 @@ +/**************************************************************************** + **************************************************************************** + *** + *** This header was automatically generated from a Bluez header + *** of the same name, to make information necessary for userspace to + *** call into the kernel available to Android. It contains only constants, + *** structures, and macros generated from the original header, and thus, + *** contains no copyrightable information. + *** + **************************************************************************** + ****************************************************************************/ +#ifndef __HCI_LIB_H +#define __HCI_LIB_H + +#ifdef __cplusplus +#endif +#ifdef __cplusplus +#endif +static inline int +hci_test_bit (int nr, void *addr) +{ + return *((uint32_t *) addr + (nr >> 5)) & (1 << (nr & 31)); +} +#endif diff --git a/external/bluez_bluetooth/inc/bluetooth/l2cap.h b/external/bluez_bluetooth/inc/bluetooth/l2cap.h new file mode 100644 index 000000000..514c16eb2 --- /dev/null +++ b/external/bluez_bluetooth/inc/bluetooth/l2cap.h @@ -0,0 +1,87 @@ +/**************************************************************************** + **************************************************************************** + *** + *** This header was automatically generated from a Linux kernel header + *** of the same name, to make information necessary for userspace to + *** call into the kernel available to libc. It contains only constants, + *** structures, and macros generated from the original header, and thus, + *** contains no copyrightable information. + *** + **************************************************************************** + ****************************************************************************/ +#ifndef __L2CAP_H +#define __L2CAP_H + +#ifdef __cplusplus +#endif +#include <sys/socket.h> +#define L2CAP_DEFAULT_MTU 672 +#define L2CAP_DEFAULT_FLUSH_TO 0xFFFF +#define L2CAP_CONN_TIMEOUT (HZ * 40) +#define L2CAP_OPTIONS 0x01 +#define L2CAP_CONNINFO 0x02 +#define L2CAP_LM 0x03 +#define L2CAP_LM_MASTER 0x0001 +#define L2CAP_LM_AUTH 0x0002 +#define L2CAP_LM_ENCRYPT 0x0004 +#define L2CAP_LM_TRUSTED 0x0008 +#define L2CAP_LM_RELIABLE 0x0010 +#define L2CAP_LM_SECURE 0x0020 +#define L2CAP_LM_FLUSHABLE 0x0040 +#define L2CAP_COMMAND_REJ 0x01 +#define L2CAP_CONN_REQ 0x02 +#define L2CAP_CONN_RSP 0x03 +#define L2CAP_CONF_REQ 0x04 +#define L2CAP_CONF_RSP 0x05 +#define L2CAP_DISCONN_REQ 0x06 +#define L2CAP_DISCONN_RSP 0x07 +#define L2CAP_ECHO_REQ 0x08 +#define L2CAP_ECHO_RSP 0x09 +#define L2CAP_INFO_REQ 0x0a +#define L2CAP_INFO_RSP 0x0b +#define L2CAP_HDR_SIZE 4 +#define L2CAP_CMD_HDR_SIZE 4 +#define L2CAP_CMD_REJ_SIZE 2 +#define L2CAP_CONN_REQ_SIZE 4 +#define L2CAP_CONN_RSP_SIZE 8 +#define L2CAP_CR_SUCCESS 0x0000 +#define L2CAP_CR_PEND 0x0001 +#define L2CAP_CR_BAD_PSM 0x0002 +#define L2CAP_CR_SEC_BLOCK 0x0003 +#define L2CAP_CR_NO_MEM 0x0004 +#define L2CAP_CS_NO_INFO 0x0000 +#define L2CAP_CS_AUTHEN_PEND 0x0001 +#define L2CAP_CS_AUTHOR_PEND 0x0002 +#define L2CAP_CONF_REQ_SIZE 4 +#define L2CAP_CONF_RSP_SIZE 6 +#define L2CAP_CONF_SUCCESS 0x0000 +#define L2CAP_CONF_UNACCEPT 0x0001 +#define L2CAP_CONF_REJECT 0x0002 +#define L2CAP_CONF_UNKNOWN 0x0003 +#define L2CAP_CONF_OPT_SIZE 2 +#define L2CAP_CONF_MTU 0x01 +#define L2CAP_CONF_FLUSH_TO 0x02 +#define L2CAP_CONF_QOS 0x03 +#define L2CAP_CONF_RFC 0x04 +#define L2CAP_CONF_RFC_MODE 0x04 +#define L2CAP_CONF_MAX_SIZE 22 +#define L2CAP_MODE_BASIC 0x00 +#define L2CAP_MODE_RETRANS 0x01 +#define L2CAP_MODE_FLOWCTL 0x02 +#define L2CAP_DISCONN_REQ_SIZE 4 +#define L2CAP_DISCONN_RSP_SIZE 4 +#define L2CAP_INFO_REQ_SIZE 2 +#define L2CAP_INFO_RSP_SIZE 4 +#define L2CAP_IT_CL_MTU 0x0001 +#define L2CAP_IT_FEAT_MASK 0x0002 +#define L2CAP_IR_SUCCESS 0x0000 +#define L2CAP_IR_NOTSUPP 0x0001 +#ifdef __cplusplus +#endif +struct sockaddr_l2 +{ + sa_family_t l2_family; + unsigned short l2_psm; + bdaddr_t l2_bdaddr; +}; +#endif diff --git a/external/bluez_bluetooth/inc/bluetooth/rfcomm.h b/external/bluez_bluetooth/inc/bluetooth/rfcomm.h new file mode 100644 index 000000000..3610088a3 --- /dev/null +++ b/external/bluez_bluetooth/inc/bluetooth/rfcomm.h @@ -0,0 +1,47 @@ +/**************************************************************************** + **************************************************************************** + *** + *** This header was automatically generated from a Bluez header + *** of the same name, to make information necessary for userspace to + *** call into the kernel available to Android. It contains only constants, + *** structures, and macros generated from the original header, and thus, + *** contains no copyrightable information. + *** + **************************************************************************** + ****************************************************************************/ +#ifndef __RFCOMM_H +#define __RFCOMM_H + +#ifdef __cplusplus +#endif +#include <sys/socket.h> +#define RFCOMM_DEFAULT_MTU 127 +#define RFCOMM_PSM 3 +#define RFCOMM_CONN_TIMEOUT (HZ * 30) +#define RFCOMM_DISC_TIMEOUT (HZ * 20) +#define RFCOMM_CONNINFO 0x02 +#define RFCOMM_LM 0x03 +#define RFCOMM_LM_MASTER 0x0001 +#define RFCOMM_LM_AUTH 0x0002 +#define RFCOMM_LM_ENCRYPT 0x0004 +#define RFCOMM_LM_TRUSTED 0x0008 +#define RFCOMM_LM_RELIABLE 0x0010 +#define RFCOMM_LM_SECURE 0x0020 +#define RFCOMM_MAX_DEV 256 +#define RFCOMMCREATEDEV _IOW('R', 200, int) +#define RFCOMMRELEASEDEV _IOW('R', 201, int) +#define RFCOMMGETDEVLIST _IOR('R', 210, int) +#define RFCOMMGETDEVINFO _IOR('R', 211, int) +#define RFCOMM_REUSE_DLC 0 +#define RFCOMM_RELEASE_ONHUP 1 +#define RFCOMM_HANGUP_NOW 2 +#define RFCOMM_TTY_ATTACHED 3 +#ifdef __cplusplus +#endif +struct sockaddr_rc +{ + sa_family_t rc_family; + bdaddr_t rc_bdaddr; + uint8_t rc_channel; +}; +#endif diff --git a/external/bluez_bluetooth/inc/bluetooth/sco.h b/external/bluez_bluetooth/inc/bluetooth/sco.h new file mode 100644 index 000000000..96b8a0a4f --- /dev/null +++ b/external/bluez_bluetooth/inc/bluetooth/sco.h @@ -0,0 +1,32 @@ +/**************************************************************************** + **************************************************************************** + *** + *** This header was automatically generated from a Bluez header + *** of the same name, to make information necessary for userspace to + *** call into the kernel available to Android. It contains only constants, + *** structures, and macros generated from the original header, and thus, + *** contains no copyrightable information. + *** + **************************************************************************** + ****************************************************************************/ +#ifndef __SCO_H +#define __SCO_H + +#ifdef __cplusplus +#endif +#define SCO_DEFAULT_MTU 500 +#define SCO_DEFAULT_FLUSH_TO 0xFFFF +#define SCO_CONN_TIMEOUT (HZ * 40) +#define SCO_DISCONN_TIMEOUT (HZ * 2) +#define SCO_CONN_IDLE_TIMEOUT (HZ * 60) +#define SCO_OPTIONS 0x01 +#define SCO_CONNINFO 0x02 +#ifdef __cplusplus +#endif +struct sockaddr_sco +{ + sa_family_t sco_family; + bdaddr_t sco_bdaddr; + uint16_t sco_pkt_type; +}; +#endif diff --git a/external/boost/Makefile b/external/boost/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/boost/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/boost/Module_boost.mk b/external/boost/Module_boost.mk new file mode 100644 index 000000000..252bf1c9a --- /dev/null +++ b/external/boost/Module_boost.mk @@ -0,0 +1,21 @@ +# -*- 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,boost)) + +$(eval $(call gb_Module_add_targets,boost,\ + StaticLibrary_boost_date_time \ + StaticLibrary_boost_filesystem \ + StaticLibrary_boost_locale \ + StaticLibrary_boost_system \ + StaticLibrary_boost_iostreams \ + UnpackedTarball_boost \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/boost/README b/external/boost/README new file mode 100644 index 000000000..7e6426bf9 --- /dev/null +++ b/external/boost/README @@ -0,0 +1,4 @@ +From [http://www.boost.org/]. + +Apart from the spirit parsing framework, LibreOffice currently mostly +uses the smart pointers, pool memory and binders functionality. diff --git a/external/boost/StaticLibrary_boost_date_time.mk b/external/boost/StaticLibrary_boost_date_time.mk new file mode 100644 index 000000000..573947fd7 --- /dev/null +++ b/external/boost/StaticLibrary_boost_date_time.mk @@ -0,0 +1,39 @@ +# -*- 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_StaticLibrary_StaticLibrary,boost_date_time)) + +$(eval $(call gb_StaticLibrary_use_unpacked,boost_date_time,boost)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_date_time)) + +# disable "auto link" "feature" on MSVC +$(eval $(call gb_StaticLibrary_add_defs,boost_date_time,\ + -DBOOST_ALL_NO_LIB \ +)) + +# Needed when building against MSVC in C++17 mode, as +# workdir/UnpackedTarball/boost/boost/numeric/conversion/detail/converter.hpp uses +# std::unary_function: +$(eval $(call gb_StaticLibrary_add_defs,boost_date_time, \ + -D_HAS_AUTO_PTR_ETC=1 \ +)) + +$(eval $(call gb_StaticLibrary_use_external,boost_date_time,boost_headers)) + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_date_time,cpp)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_date_time,\ + UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators \ + UnpackedTarball/boost/libs/date_time/src/gregorian/gregorian_types \ + UnpackedTarball/boost/libs/date_time/src/gregorian/greg_month \ + UnpackedTarball/boost/libs/date_time/src/gregorian/greg_weekday \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/boost/StaticLibrary_boost_filesystem.mk b/external/boost/StaticLibrary_boost_filesystem.mk new file mode 100644 index 000000000..a49f06b6d --- /dev/null +++ b/external/boost/StaticLibrary_boost_filesystem.mk @@ -0,0 +1,36 @@ +# -*- 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_StaticLibrary_StaticLibrary,boost_filesystem)) + +$(eval $(call gb_StaticLibrary_use_unpacked,boost_filesystem,boost)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_filesystem)) + +# disable "auto link" "feature" on MSVC +$(eval $(call gb_StaticLibrary_add_defs,boost_filesystem,\ + -DBOOST_ALL_NO_LIB \ +)) + +$(eval $(call gb_StaticLibrary_use_external,boost_filesystem,boost_headers)) + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_filesystem,cpp)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_filesystem,\ + UnpackedTarball/boost/libs/filesystem/src/codecvt_error_category \ + UnpackedTarball/boost/libs/filesystem/src/operations \ + UnpackedTarball/boost/libs/filesystem/src/path \ + UnpackedTarball/boost/libs/filesystem/src/path_traits \ + UnpackedTarball/boost/libs/filesystem/src/portability \ + UnpackedTarball/boost/libs/filesystem/src/unique_path \ + UnpackedTarball/boost/libs/filesystem/src/utf8_codecvt_facet \ + UnpackedTarball/boost/libs/filesystem/src/windows_file_codecvt \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/boost/StaticLibrary_boost_iostreams.mk b/external/boost/StaticLibrary_boost_iostreams.mk new file mode 100644 index 000000000..0884a5aee --- /dev/null +++ b/external/boost/StaticLibrary_boost_iostreams.mk @@ -0,0 +1,35 @@ +# -*- 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_StaticLibrary_StaticLibrary,boost_iostreams)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_iostreams)) + +# disable "auto link" "feature" on MSVC +$(eval $(call gb_StaticLibrary_add_defs,boost_iostreams,\ + -DBOOST_ALL_NO_LIB \ +)) + +$(eval $(call gb_StaticLibrary_use_unpacked,boost_iostreams,boost)) + + +$(eval $(call gb_StaticLibrary_use_externals,boost_iostreams, \ + zlib \ + boost_headers \ +)) + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_iostreams,cpp)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_iostreams,\ + UnpackedTarball/boost/libs/iostreams/src/zlib \ + UnpackedTarball/boost/libs/iostreams/src/gzip \ + UnpackedTarball/boost/libs/iostreams/src/file_descriptor \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/boost/StaticLibrary_boost_locale.mk b/external/boost/StaticLibrary_boost_locale.mk new file mode 100644 index 000000000..548109772 --- /dev/null +++ b/external/boost/StaticLibrary_boost_locale.mk @@ -0,0 +1,66 @@ +# -*- 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_StaticLibrary_StaticLibrary,boost_locale)) + +$(eval $(call gb_StaticLibrary_use_unpacked,boost_locale,boost)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_locale)) + +# disable "auto link" "feature" on MSVC +$(eval $(call gb_StaticLibrary_add_defs,boost_locale,\ + -DBOOST_ALL_NO_LIB -DBOOST_LOCALE_NO_WINAPI_BACKEND -DBOOST_LOCALE_NO_POSIX_BACKEND -DBOOST_USE_WINDOWS_H \ +)) + +# Needed when building against MSVC resp. libc++ in C++17 mode, as Boost 1.65.1 +# workdir/UnpackedTarball/boost/boost/locale/generator.hpp contains "std::auto_ptr<data> d;": +$(eval $(call gb_StaticLibrary_add_defs,boost_locale, \ + -D_HAS_AUTO_PTR_ETC=1 \ + -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR \ +)) + +$(eval $(call gb_StaticLibrary_use_external,boost_locale,boost_headers)) + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_locale,cpp)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_locale,\ + UnpackedTarball/boost/libs/locale/src/encoding/codepage \ + UnpackedTarball/boost/libs/locale/src/shared/date_time \ + UnpackedTarball/boost/libs/locale/src/shared/format \ + UnpackedTarball/boost/libs/locale/src/shared/formatting \ + UnpackedTarball/boost/libs/locale/src/shared/generator \ + UnpackedTarball/boost/libs/locale/src/shared/ids \ + UnpackedTarball/boost/libs/locale/src/shared/localization_backend \ + UnpackedTarball/boost/libs/locale/src/shared/message \ + UnpackedTarball/boost/libs/locale/src/shared/mo_lambda \ + UnpackedTarball/boost/libs/locale/src/std/codecvt \ + UnpackedTarball/boost/libs/locale/src/std/collate \ + UnpackedTarball/boost/libs/locale/src/std/converter \ + UnpackedTarball/boost/libs/locale/src/std/numeric \ + UnpackedTarball/boost/libs/locale/src/std/std_backend \ + UnpackedTarball/boost/libs/locale/src/util/codecvt_converter \ + UnpackedTarball/boost/libs/locale/src/util/default_locale \ + UnpackedTarball/boost/libs/locale/src/util/gregorian \ + UnpackedTarball/boost/libs/locale/src/util/info \ + UnpackedTarball/boost/libs/locale/src/util/locale_data \ +)) + +ifeq ($(OS),WNT) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_locale,\ + UnpackedTarball/boost/libs/locale/src/win32/collate \ + UnpackedTarball/boost/libs/locale/src/win32/converter \ + UnpackedTarball/boost/libs/locale/src/win32/lcid \ + UnpackedTarball/boost/libs/locale/src/win32/numeric \ + UnpackedTarball/boost/libs/locale/src/win32/win_backend \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/boost/StaticLibrary_boost_system.mk b/external/boost/StaticLibrary_boost_system.mk new file mode 100644 index 000000000..e4b05d7b5 --- /dev/null +++ b/external/boost/StaticLibrary_boost_system.mk @@ -0,0 +1,29 @@ +# -*- 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_StaticLibrary_StaticLibrary,boost_system)) + +$(eval $(call gb_StaticLibrary_use_unpacked,boost_system,boost)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,boost_system)) + +# disable "auto link" "feature" on MSVC +$(eval $(call gb_StaticLibrary_add_defs,boost_system,\ + -DBOOST_ALL_NO_LIB \ +)) + +$(eval $(call gb_StaticLibrary_use_external,boost_system,boost_headers)) + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_system,cpp)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_system,\ + UnpackedTarball/boost/libs/system/src/error_code \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk new file mode 100644 index 000000000..046f7e6da --- /dev/null +++ b/external/boost/UnpackedTarball_boost.mk @@ -0,0 +1,54 @@ +# -*- 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/. +# + +boost_patches := + +#https://svn.boost.org/trac/boost/ticket/6142 +boost_patches += boost.6142.warnings.patch.1 + +# https://svn.boost.org/trac/boost/ticket/9903 +boost_patches += boost.utility.Wundef.warnings.patch + +boost_patches += boost.noiconv.patch + +boost_patches += rtti.patch.0 + +# https://svn.boost.org/trac/boost/ticket/11505 +boost_patches += boost_1_59_0.mpl.config.wundef.patch +# https://svn.boost.org/trac/boost/ticket/11501 +boost_patches += boost_1_59_0.property_tree.wreturn-type.patch + +boost_patches += clang-cl.patch.0 + +boost_patches += boost_1_60_0.undef.warning.patch +boost_patches += boost_1_63_0.undef.warning.patch.1 + +boost_patches += boost-android-unified.patch.1 + +boost_patches += windows-no-utf8-locales.patch.0 + +boost_patches += gcc9.patch.0 + +boost_patches += msvc2017.patch.0 + +# boost/format/alt_sstream_impl.hpp part covered by <https://github.com/boostorg/format/pull/70> +# "Removed deprecated std::allocator<void>": +boost_patches += c++20-allocator.patch.0 + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) + +$(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,boost,3)) + +$(eval $(call gb_UnpackedTarball_add_patches,boost,\ + $(foreach patch,$(boost_patches),external/boost/$(patch)) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/boost/boost-android-unified.patch.1 b/external/boost/boost-android-unified.patch.1 new file mode 100644 index 000000000..6488bf619 --- /dev/null +++ b/external/boost/boost-android-unified.patch.1 @@ -0,0 +1,22 @@ +--- a/boost/type_traits/detail/is_function_cxx_11.hpp ++++ b/boost/type_traits/detail/is_function_cxx_11.hpp +@@ -18,7 +18,7 @@ + template <class T> + struct is_function : public false_type {}; + +-#if defined(__cpp_noexcept_function_type) && !defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) ++#if defined(__cpp_noexcept_function_type) && !defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) && !(defined __ANDROID__ && defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 && __clang_patchlevel__ == 300080) + #define BOOST_TT_NOEXCEPT_PARAM , bool NE + #define BOOST_TT_NOEXCEPT_DECL noexcept(NE) + #else +--- a/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp ++++ b/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp +@@ -31,7 +31,7 @@ + template <class T> + struct is_member_function_pointer<T const volatile> : public is_member_function_pointer<T> {}; + +-#if defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) ++#if defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) || (defined __ANDROID__ && defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 && __clang_patchlevel__ == 300080) + // MSVC can't handle noexcept(b) as a deduced template parameter + // so we will have to write everything out :( + #define BOOST_TT_NOEXCEPT_PARAM diff --git a/external/boost/boost.6142.warnings.patch.1 b/external/boost/boost.6142.warnings.patch.1 new file mode 100644 index 000000000..b38efd90d --- /dev/null +++ b/external/boost/boost.6142.warnings.patch.1 @@ -0,0 +1,38 @@ +--- a/boost/mpl/has_xxx.hpp.orig 2011-11-18 13:45:00.000000000 +0100 ++++ b/boost/mpl/has_xxx.hpp 2011-11-18 13:47:19.000000000 +0100 +@@ -341,7 +341,7 @@ + ) \ + /**/ + +-# if !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION ++# if !defined(BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION) || !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION + # define BOOST_MPL_HAS_MEMBER_REJECT(args, member_macro) \ + template< typename V > \ + static boost::mpl::aux::no_tag \ +@@ -354,7 +354,7 @@ + /**/ + # endif + +-# if !BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES ++# if !defined(BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES) || !BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES + # define BOOST_MPL_HAS_MEMBER_MULTI_ACCEPT(z, n, args) \ + template< typename V > \ + static boost::mpl::aux::yes_tag \ +@@ -383,7 +383,7 @@ + /**/ + # endif + +-# if !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION ++# if !defined(BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION) || !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION + # define BOOST_MPL_HAS_MEMBER_TEST(args) \ + sizeof(BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)< U >(0)) \ + == sizeof(boost::mpl::aux::yes_tag) \ +@@ -456,7 +456,7 @@ + ) \ + /**/ + +-# if BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE ++# if defined(BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE) && BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE + + # if !defined(BOOST_MPL_HAS_XXX_NEEDS_NAMESPACE_LEVEL_SUBSTITUTE) + # if BOOST_WORKAROUND(BOOST_MSVC, <= 1400) diff --git a/external/boost/boost.noiconv.patch b/external/boost/boost.noiconv.patch new file mode 100644 index 000000000..1bce0414d --- /dev/null +++ b/external/boost/boost.noiconv.patch @@ -0,0 +1,51 @@ +diff -ru boost.orig/boost/libs/locale/src/encoding/codepage.cpp boost/boost/libs/locale/src/encoding/codepage.cpp +--- foo/misc/boost.orig/libs/locale/src/encoding/codepage.cpp ++++ foo/misc/boost/libs/locale/src/encoding/codepage.cpp +@@ -39,6 +39,7 @@ + char const *from_charset, + method_type how) + { ++ #if defined(BOOST_LOCALE_WITH_ICONV) || defined(BOOST_LOCALE_WITH_ICU) || defined(BOOST_LOCALE_WITH_WCONV) + hold_ptr<converter_between> cvt; + #ifdef BOOST_LOCALE_WITH_ICONV + cvt.reset(new iconv_between()); +@@ -55,6 +56,7 @@ + if(cvt->open(to_charset,from_charset,how)) + return cvt->convert(begin,end); + #endif ++ #endif + throw invalid_charset_error(std::string(to_charset) + " or " + from_charset); + } + +@@ -65,6 +67,7 @@ + char const *charset, + method_type how) + { ++ #if defined(BOOST_LOCALE_WITH_ICONV) || defined(BOOST_LOCALE_WITH_ICU) || defined(BOOST_LOCALE_WITH_WCONV) + hold_ptr<converter_to_utf<CharType> > cvt; + #ifdef BOOST_LOCALE_WITH_ICONV + cvt.reset(new iconv_to_utf<CharType>()); +@@ -81,6 +84,7 @@ + if(cvt->open(charset,how)) + return cvt->convert(begin,end); + #endif ++ #endif + throw invalid_charset_error(charset); + } + +@@ -91,6 +95,7 @@ + char const *charset, + method_type how) + { ++ #if defined(BOOST_LOCALE_WITH_ICONV) || defined(BOOST_LOCALE_WITH_ICU) || defined(BOOST_LOCALE_WITH_WCONV) + hold_ptr<converter_from_utf<CharType> > cvt; + #ifdef BOOST_LOCALE_WITH_ICONV + cvt.reset(new iconv_from_utf<CharType>()); +@@ -107,6 +112,7 @@ + if(cvt->open(charset,how)) + return cvt->convert(begin,end); + #endif ++ #endif + throw invalid_charset_error(charset); + } + diff --git a/external/boost/boost.utility.Wundef.warnings.patch b/external/boost/boost.utility.Wundef.warnings.patch new file mode 100644 index 000000000..034709e26 --- /dev/null +++ b/external/boost/boost.utility.Wundef.warnings.patch @@ -0,0 +1,11 @@ +--- foo/foo/foo/boost/utility/result_of.hpp ++++ foo/foo/foo/boost/utility/result_of.hpp +@@ -72,7 +72,7 @@ + // There doesn't seem to be any other way to turn this off such that the presence of + // the user-defined operator,() below doesn't cause spurious warning all over the place, + // so unconditionally turn it off. +-#if BOOST_MSVC ++#if defined(BOOST_MSVC) && BOOST_MSVC + # pragma warning(disable: 4913) // user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used + #endif + diff --git a/external/boost/boost_1_59_0.mpl.config.wundef.patch b/external/boost/boost_1_59_0.mpl.config.wundef.patch new file mode 100644 index 000000000..2826cfc2b --- /dev/null +++ b/external/boost/boost_1_59_0.mpl.config.wundef.patch @@ -0,0 +1,11 @@ +diff -ru boost.orig/boost/mpl/aux_/config/operators.hpp boost/boost/mpl/aux_/config/operators.hpp +--- foo/misc/boost.orig/boost/mpl/aux_/config/operators.hpp 2015-07-19 11:20:40.015955021 +0200 ++++ foo/misc/boost/boost/mpl/aux_/config/operators.hpp 2015-07-19 11:33:14.342946543 +0200 +@@ -24,7 +24,6 @@ + || BOOST_WORKAROUND(__EDG_VERSION__, <= 245) \ + || BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, <= 0x0295) \ + || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) \ +- || BOOST_WORKAROUND(__NVCC__, BOOST_TESTED_AT(1)) \ + ) + + # define BOOST_MPL_CFG_USE_OPERATORS_OVERLOADING diff --git a/external/boost/boost_1_59_0.property_tree.wreturn-type.patch b/external/boost/boost_1_59_0.property_tree.wreturn-type.patch new file mode 100644 index 000000000..1673e4bd8 --- /dev/null +++ b/external/boost/boost_1_59_0.property_tree.wreturn-type.patch @@ -0,0 +1,14 @@ +aka MSVC warning C4715: not all control paths return a value + +diff -ru boost.org/boost/property_tree/json_parser/detail/standard_callbacks.hpp boost/boost/property_tree/json_parser/detail/standard_callbacks.hpp +--- foo/misc/boost.org/boost/property_tree/json_parser/detail/standard_callbacks.hpp 2015-07-07 14:20:48.000000000 +0200 ++++ foo/misc/boost/boost/property_tree/json_parser/detail/standard_callbacks.hpp 2015-07-22 08:35:07.764263463 +0200 +@@ -128,7 +128,7 @@ + } + case object: + default: +- BOOST_ASSERT(false); // must start with string, i.e. call new_value ++ std::abort(); + case key: { + l.t->push_back(std::make_pair(key_buffer, Ptree())); + l.k = object; diff --git a/external/boost/boost_1_60_0.undef.warning.patch b/external/boost/boost_1_60_0.undef.warning.patch new file mode 100644 index 000000000..1e72d4e17 --- /dev/null +++ b/external/boost/boost_1_60_0.undef.warning.patch @@ -0,0 +1,16 @@ +--- a/b/boost/boost/config/workaround.hpp ++++ a/b/boost/boost/config/workaround.hpp +@@ -237,6 +237,13 @@ + #else + #define BOOST_INTEL_WORKAROUND_GUARD 0 + #endif ++ ++#ifndef __clang_major__ ++#define __clang_major___WORKAROUND_GUARD 1 ++#else ++#define __clang_major___WORKAROUND_GUARD 0 ++#endif ++ + // Always define to zero, if it's used it'll be defined my MPL: + #define BOOST_MPL_CFG_GCC_WORKAROUND_GUARD 0 + diff --git a/external/boost/boost_1_63_0.undef.warning.patch.1 b/external/boost/boost_1_63_0.undef.warning.patch.1 new file mode 100644 index 000000000..2773138e2 --- /dev/null +++ b/external/boost/boost_1_63_0.undef.warning.patch.1 @@ -0,0 +1,12 @@ +diff -up boost/boost/math/special_functions/fpclassify.hpp.dt boost/boost/math/special_functions/fpclassify.hpp +--- boost/boost/math/special_functions/fpclassify.hpp.dt 2017-02-03 07:59:18.805415876 +0100 ++++ boost/boost/math/special_functions/fpclassify.hpp 2017-02-03 08:00:45.046494362 +0100 +@@ -134,7 +134,7 @@ inline bool is_nan_helper(T, const boost + inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnanq(f); } + inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnanq(f); } + #elif defined(BOOST_GNU_STDLIB) && BOOST_GNU_STDLIB && \ +- _GLIBCXX_USE_C99_MATH && !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC ++ _GLIBCXX_USE_C99_MATH && (!defined(_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC) || !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC) + inline bool is_nan_helper(__float128 f, const boost::true_type&) { return std::isnan(static_cast<double>(f)); } + inline bool is_nan_helper(__float128 f, const boost::false_type&) { return std::isnan(static_cast<double>(f)); } + #else diff --git a/external/boost/c++20-allocator.patch.0 b/external/boost/c++20-allocator.patch.0 new file mode 100644 index 000000000..30a34e1b2 --- /dev/null +++ b/external/boost/c++20-allocator.patch.0 @@ -0,0 +1,24 @@ +--- boost/bimap/detail/bimap_core.hpp ++++ boost/bimap/detail/bimap_core.hpp +@@ -404,8 +404,8 @@ + < + relation, + core_indices, +- BOOST_DEDUCED_TYPENAME parameters::allocator:: +- BOOST_NESTED_TEMPLATE rebind<relation>::other ++ typename std::allocator_traits<BOOST_DEDUCED_TYPENAME parameters::allocator>:: ++ BOOST_NESTED_TEMPLATE rebind_alloc<relation> + + > core_type; + +--- boost/format/alt_sstream_impl.hpp ++++ boost/format/alt_sstream_impl.hpp +@@ -258,7 +258,7 @@ + void *vdptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0); + newptr = static_cast<Ch *>(vdptr); + #else +- newptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0); ++ newptr = std::allocator_traits<compat_allocator_type>::allocate(alloc_, new_size, is_allocated_? oldptr : 0); + #endif + } + diff --git a/external/boost/clang-cl.patch.0 b/external/boost/clang-cl.patch.0 new file mode 100644 index 000000000..49259a0d5 --- /dev/null +++ b/external/boost/clang-cl.patch.0 @@ -0,0 +1,48 @@ +--- boost/multi_array/base.hpp ++++ boost/multi_array/base.hpp +@@ -222,7 +222,7 @@ + // MSVC 2010 is broken in debug mode: it requires + // that an Output Iterator have output_iterator_tag in its iterator_category if + // that iterator is not bidirectional_iterator or random_access_iterator. +-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) ++#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) || defined __clang__ + struct mutable_iterator_tag + : boost::random_access_traversal_tag, std::input_iterator_tag + { +@@ -274,7 +274,7 @@ + // + // iterator support + // +-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) ++#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) || defined __clang__ + // Deal with VC 2010 output_iterator_tag requirement + typedef array_iterator<T,T*,mpl::size_t<NumDims>,reference, + mutable_iterator_tag> iterator; + +# clang-cl cannot use MSVC's ATOMIC_FLAG_INIT: +--- boost/smart_ptr/detail/spinlock.hpp ++++ boost/smart_ptr/detail/spinlock.hpp +@@ -43,7 +43,7 @@ + #elif defined( BOOST_SP_USE_PTHREADS ) + # include <boost/smart_ptr/detail/spinlock_pt.hpp> + +-#elif !defined( BOOST_NO_CXX11_HDR_ATOMIC ) ++#elif !defined( BOOST_NO_CXX11_HDR_ATOMIC ) && !(defined __clang__ && defined _MSC_VER && _MSC_VER == 1916) + # include <boost/smart_ptr/detail/spinlock_std_atomic.hpp> + + #elif defined(__GNUC__) && defined( __arm__ ) && !defined( __thumb__ ) + +# workdir/UnpackedTarball/boost/libs/thread/src/win32/thread.cpp(1006,36) : error: dllimport cannot be applied to non-inline function definition +# BOOST_THREAD_DECL void __cdecl on_process_enter() +# ^ +--- boost/thread/detail/config.hpp ++++ boost/thread/detail/config.hpp +@@ -396,7 +396,7 @@ + #else //Use default + # if defined(BOOST_THREAD_PLATFORM_WIN32) + # if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) \ +- || defined(__MINGW32__) || defined(MINGW32) || defined(BOOST_MINGW32) ++ || defined(__MINGW32__) || defined(MINGW32) || defined(BOOST_MINGW32) || defined __clang__ + //For compilers supporting auto-tss cleanup + //with Boost.Threads lib, use Boost.Threads lib + # define BOOST_THREAD_USE_LIB diff --git a/external/boost/gcc9.patch.0 b/external/boost/gcc9.patch.0 new file mode 100644 index 000000000..f9ddfa519 --- /dev/null +++ b/external/boost/gcc9.patch.0 @@ -0,0 +1,10 @@ +--- boost/bimap/detail/map_view_iterator.hpp ++++ boost/bimap/detail/map_view_iterator.hpp +@@ -165,6 +165,7 @@ + : base_(iter.base()) {} + const_map_view_iterator(map_view_iterator<Tag,BimapCore> i) + : base_(i.base()) {} ++ const_map_view_iterator & operator = (const_map_view_iterator const &) = default; + + BOOST_DEDUCED_TYPENAME base_::reference dereference() const + { diff --git a/external/boost/include/boost/algorithm/string.hpp b/external/boost/include/boost/algorithm/string.hpp new file mode 100644 index 000000000..333a3f2f9 --- /dev/null +++ b/external/boost/include/boost/algorithm/string.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/algorithm/string.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/algorithm/string/predicate.hpp b/external/boost/include/boost/algorithm/string/predicate.hpp new file mode 100644 index 000000000..e0b5b9a3e --- /dev/null +++ b/external/boost/include/boost/algorithm/string/predicate.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/algorithm/string/predicate.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/archive/iterators/base64_from_binary.hpp b/external/boost/include/boost/archive/iterators/base64_from_binary.hpp new file mode 100644 index 000000000..de893033a --- /dev/null +++ b/external/boost/include/boost/archive/iterators/base64_from_binary.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/archive/iterators/base64_from_binary.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/archive/iterators/binary_from_base64.hpp b/external/boost/include/boost/archive/iterators/binary_from_base64.hpp new file mode 100644 index 000000000..957297b94 --- /dev/null +++ b/external/boost/include/boost/archive/iterators/binary_from_base64.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/archive/iterators/binary_from_base64.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/archive/iterators/remove_whitespace.hpp b/external/boost/include/boost/archive/iterators/remove_whitespace.hpp new file mode 100644 index 000000000..07b3d224f --- /dev/null +++ b/external/boost/include/boost/archive/iterators/remove_whitespace.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/archive/iterators/remove_whitespace.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/archive/iterators/transform_width.hpp b/external/boost/include/boost/archive/iterators/transform_width.hpp new file mode 100644 index 000000000..edee6d81c --- /dev/null +++ b/external/boost/include/boost/archive/iterators/transform_width.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/archive/iterators/transform_width.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/bind.hpp b/external/boost/include/boost/bind.hpp new file mode 100644 index 000000000..3e42e7bac --- /dev/null +++ b/external/boost/include/boost/bind.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/bind.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/cast.hpp b/external/boost/include/boost/cast.hpp new file mode 100644 index 000000000..eafffd76f --- /dev/null +++ b/external/boost/include/boost/cast.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/cast.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/circular_buffer.hpp b/external/boost/include/boost/circular_buffer.hpp new file mode 100644 index 000000000..7b817b4a1 --- /dev/null +++ b/external/boost/include/boost/circular_buffer.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/circular_buffer.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/cstdint.hpp b/external/boost/include/boost/cstdint.hpp new file mode 100644 index 000000000..78cbaefe5 --- /dev/null +++ b/external/boost/include/boost/cstdint.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/cstdint.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/current_function.hpp b/external/boost/include/boost/current_function.hpp new file mode 100644 index 000000000..b9668d118 --- /dev/null +++ b/external/boost/include/boost/current_function.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/current_function.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/date_time.hpp b/external/boost/include/boost/date_time.hpp new file mode 100644 index 000000000..d38505519 --- /dev/null +++ b/external/boost/include/boost/date_time.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/date_time.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/date_time/posix_time/posix_time.hpp b/external/boost/include/boost/date_time/posix_time/posix_time.hpp new file mode 100644 index 000000000..cb03ce8a6 --- /dev/null +++ b/external/boost/include/boost/date_time/posix_time/posix_time.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/date_time/posix_time/posix_time.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/filesystem.hpp b/external/boost/include/boost/filesystem.hpp new file mode 100644 index 000000000..c7654f869 --- /dev/null +++ b/external/boost/include/boost/filesystem.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/filesystem.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/filesystem/path.hpp b/external/boost/include/boost/filesystem/path.hpp new file mode 100644 index 000000000..df361b590 --- /dev/null +++ b/external/boost/include/boost/filesystem/path.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/filesystem/path.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/functional/hash.hpp b/external/boost/include/boost/functional/hash.hpp new file mode 100644 index 000000000..5ea6c8f4e --- /dev/null +++ b/external/boost/include/boost/functional/hash.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/functional/hash.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/fusion/adapted/std_pair.hpp b/external/boost/include/boost/fusion/adapted/std_pair.hpp new file mode 100644 index 000000000..4ef4c2256 --- /dev/null +++ b/external/boost/include/boost/fusion/adapted/std_pair.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/fusion/adapted/std_pair.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/fusion/include/adapt_struct.hpp b/external/boost/include/boost/fusion/include/adapt_struct.hpp new file mode 100644 index 000000000..e941d809b --- /dev/null +++ b/external/boost/include/boost/fusion/include/adapt_struct.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/fusion/include/adapt_struct.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/intrusive/circular_list_algorithms.hpp b/external/boost/include/boost/intrusive/circular_list_algorithms.hpp new file mode 100644 index 000000000..52abf97f5 --- /dev/null +++ b/external/boost/include/boost/intrusive/circular_list_algorithms.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/intrusive/circular_list_algorithms.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/intrusive_ptr.hpp b/external/boost/include/boost/intrusive_ptr.hpp new file mode 100644 index 000000000..b1e72bddd --- /dev/null +++ b/external/boost/include/boost/intrusive_ptr.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/intrusive_ptr.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/io/ios_state.hpp b/external/boost/include/boost/io/ios_state.hpp new file mode 100644 index 000000000..6c9ff22d3 --- /dev/null +++ b/external/boost/include/boost/io/ios_state.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/io/ios_state.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/iostreams/filter/gzip.hpp b/external/boost/include/boost/iostreams/filter/gzip.hpp new file mode 100644 index 000000000..5290e5872 --- /dev/null +++ b/external/boost/include/boost/iostreams/filter/gzip.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/iostreams/filter/gzip.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/iostreams/filtering_stream.hpp b/external/boost/include/boost/iostreams/filtering_stream.hpp new file mode 100644 index 000000000..b6f59a57b --- /dev/null +++ b/external/boost/include/boost/iostreams/filtering_stream.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/iostreams/filtering_stream.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/iterator/iterator_facade.hpp b/external/boost/include/boost/iterator/iterator_facade.hpp new file mode 100644 index 000000000..728a39e4f --- /dev/null +++ b/external/boost/include/boost/iterator/iterator_facade.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/iterator/iterator_facade.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/lexical_cast.hpp b/external/boost/include/boost/lexical_cast.hpp new file mode 100644 index 000000000..4103ef748 --- /dev/null +++ b/external/boost/include/boost/lexical_cast.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/lexical_cast.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/locale.hpp b/external/boost/include/boost/locale.hpp new file mode 100644 index 000000000..d9a9765d2 --- /dev/null +++ b/external/boost/include/boost/locale.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/locale.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/locale/gnu_gettext.hpp b/external/boost/include/boost/locale/gnu_gettext.hpp new file mode 100644 index 000000000..8a80fcf78 --- /dev/null +++ b/external/boost/include/boost/locale/gnu_gettext.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/locale/gnu_gettext.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/logic/tribool.hpp b/external/boost/include/boost/logic/tribool.hpp new file mode 100644 index 000000000..b2b05f3f3 --- /dev/null +++ b/external/boost/include/boost/logic/tribool.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/logic/tribool.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/math/common_factor_rt.hpp b/external/boost/include/boost/math/common_factor_rt.hpp new file mode 100644 index 000000000..14cd99bbe --- /dev/null +++ b/external/boost/include/boost/math/common_factor_rt.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/math/common_factor_rt.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/math/special_functions/expm1.hpp b/external/boost/include/boost/math/special_functions/expm1.hpp new file mode 100644 index 000000000..c4f8497f9 --- /dev/null +++ b/external/boost/include/boost/math/special_functions/expm1.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/math/special_functions/expm1.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/math/special_functions/sinc.hpp b/external/boost/include/boost/math/special_functions/sinc.hpp new file mode 100644 index 000000000..d65352347 --- /dev/null +++ b/external/boost/include/boost/math/special_functions/sinc.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/math/special_functions/sinc.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_array.hpp b/external/boost/include/boost/multi_array.hpp new file mode 100644 index 000000000..5c5991276 --- /dev/null +++ b/external/boost/include/boost/multi_array.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_array.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index/composite_key.hpp b/external/boost/include/boost/multi_index/composite_key.hpp new file mode 100644 index 000000000..d3130253d --- /dev/null +++ b/external/boost/include/boost/multi_index/composite_key.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index/composite_key.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index/identity.hpp b/external/boost/include/boost/multi_index/identity.hpp new file mode 100644 index 000000000..c22274204 --- /dev/null +++ b/external/boost/include/boost/multi_index/identity.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index/identity.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index/mem_fun.hpp b/external/boost/include/boost/multi_index/mem_fun.hpp new file mode 100644 index 000000000..aad41336c --- /dev/null +++ b/external/boost/include/boost/multi_index/mem_fun.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index/mem_fun.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index/ordered_index.hpp b/external/boost/include/boost/multi_index/ordered_index.hpp new file mode 100644 index 000000000..bc9cd14a1 --- /dev/null +++ b/external/boost/include/boost/multi_index/ordered_index.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index/ordered_index.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index/random_access_index.hpp b/external/boost/include/boost/multi_index/random_access_index.hpp new file mode 100644 index 000000000..474b79709 --- /dev/null +++ b/external/boost/include/boost/multi_index/random_access_index.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index/random_access_index.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index_container.hpp b/external/boost/include/boost/multi_index_container.hpp new file mode 100644 index 000000000..8e888b525 --- /dev/null +++ b/external/boost/include/boost/multi_index_container.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index_container.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/noncopyable.hpp b/external/boost/include/boost/noncopyable.hpp new file mode 100644 index 000000000..0fce89f25 --- /dev/null +++ b/external/boost/include/boost/noncopyable.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/noncopyable.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/none.hpp b/external/boost/include/boost/none.hpp new file mode 100644 index 000000000..fb83a5c51 --- /dev/null +++ b/external/boost/include/boost/none.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/none.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/numeric/conversion/cast.hpp b/external/boost/include/boost/numeric/conversion/cast.hpp new file mode 100644 index 000000000..9d2a0050a --- /dev/null +++ b/external/boost/include/boost/numeric/conversion/cast.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/numeric/conversion/cast.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/operators.hpp b/external/boost/include/boost/operators.hpp new file mode 100644 index 000000000..5f2b659ed --- /dev/null +++ b/external/boost/include/boost/operators.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/operators.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/optional.hpp b/external/boost/include/boost/optional.hpp new file mode 100644 index 000000000..5031d7fd2 --- /dev/null +++ b/external/boost/include/boost/optional.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/optional.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/program_options.hpp b/external/boost/include/boost/program_options.hpp new file mode 100644 index 000000000..2a71fa60e --- /dev/null +++ b/external/boost/include/boost/program_options.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/program_options.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/property_tree/json_parser.hpp b/external/boost/include/boost/property_tree/json_parser.hpp new file mode 100644 index 000000000..5c592a9f3 --- /dev/null +++ b/external/boost/include/boost/property_tree/json_parser.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/property_tree/json_parser.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/property_tree/ptree.hpp b/external/boost/include/boost/property_tree/ptree.hpp new file mode 100644 index 000000000..3619463de --- /dev/null +++ b/external/boost/include/boost/property_tree/ptree.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/property_tree/ptree.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/range/adaptor/reversed.hpp b/external/boost/include/boost/range/adaptor/reversed.hpp new file mode 100644 index 000000000..7959acae1 --- /dev/null +++ b/external/boost/include/boost/range/adaptor/reversed.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/range/adaptor/reversed.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/range/iterator_range.hpp b/external/boost/include/boost/range/iterator_range.hpp new file mode 100644 index 000000000..6f380bc5e --- /dev/null +++ b/external/boost/include/boost/range/iterator_range.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/range/iterator_range.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/rational.hpp b/external/boost/include/boost/rational.hpp new file mode 100644 index 000000000..30e34586b --- /dev/null +++ b/external/boost/include/boost/rational.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/rational.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/scoped_ptr.hpp b/external/boost/include/boost/scoped_ptr.hpp new file mode 100644 index 000000000..3c077749c --- /dev/null +++ b/external/boost/include/boost/scoped_ptr.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/scoped_ptr.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/shared_ptr.hpp b/external/boost/include/boost/shared_ptr.hpp new file mode 100644 index 000000000..a3fec816c --- /dev/null +++ b/external/boost/include/boost/shared_ptr.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/shared_ptr.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/classic.hpp b/external/boost/include/boost/spirit/include/classic.hpp new file mode 100644 index 000000000..8381c99bb --- /dev/null +++ b/external/boost/include/boost/spirit/include/classic.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/classic.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/classic_core.hpp b/external/boost/include/boost/spirit/include/classic_core.hpp new file mode 100644 index 000000000..fc3842a0a --- /dev/null +++ b/external/boost/include/boost/spirit/include/classic_core.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/classic_core.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/classic_error_handling.hpp b/external/boost/include/boost/spirit/include/classic_error_handling.hpp new file mode 100644 index 000000000..183e1d1ae --- /dev/null +++ b/external/boost/include/boost/spirit/include/classic_error_handling.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/classic_error_handling.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/classic_file_iterator.hpp b/external/boost/include/boost/spirit/include/classic_file_iterator.hpp new file mode 100644 index 000000000..f1265fb1a --- /dev/null +++ b/external/boost/include/boost/spirit/include/classic_file_iterator.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/classic_file_iterator.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/classic_utility.hpp b/external/boost/include/boost/spirit/include/classic_utility.hpp new file mode 100644 index 000000000..b30432515 --- /dev/null +++ b/external/boost/include/boost/spirit/include/classic_utility.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/classic_utility.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/phoenix.hpp b/external/boost/include/boost/spirit/include/phoenix.hpp new file mode 100644 index 000000000..f0b865bbb --- /dev/null +++ b/external/boost/include/boost/spirit/include/phoenix.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/phoenix.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/qi.hpp b/external/boost/include/boost/spirit/include/qi.hpp new file mode 100644 index 000000000..673e108ac --- /dev/null +++ b/external/boost/include/boost/spirit/include/qi.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/qi.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/qi_attr.hpp b/external/boost/include/boost/spirit/include/qi_attr.hpp new file mode 100644 index 000000000..8f7cfcb54 --- /dev/null +++ b/external/boost/include/boost/spirit/include/qi_attr.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/qi_attr.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/qi_lit.hpp b/external/boost/include/boost/spirit/include/qi_lit.hpp new file mode 100644 index 000000000..d78a9b687 --- /dev/null +++ b/external/boost/include/boost/spirit/include/qi_lit.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/qi_lit.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/qi_optional.hpp b/external/boost/include/boost/spirit/include/qi_optional.hpp new file mode 100644 index 000000000..744e3896b --- /dev/null +++ b/external/boost/include/boost/spirit/include/qi_optional.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/qi_optional.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/qi_parse_attr.hpp b/external/boost/include/boost/spirit/include/qi_parse_attr.hpp new file mode 100644 index 000000000..b02d9154e --- /dev/null +++ b/external/boost/include/boost/spirit/include/qi_parse_attr.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/qi_parse_attr.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/qi_sequence.hpp b/external/boost/include/boost/spirit/include/qi_sequence.hpp new file mode 100644 index 000000000..9a03d2fda --- /dev/null +++ b/external/boost/include/boost/spirit/include/qi_sequence.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/qi_sequence.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/spirit/include/qi_symbols.hpp b/external/boost/include/boost/spirit/include/qi_symbols.hpp new file mode 100644 index 000000000..38b6464da --- /dev/null +++ b/external/boost/include/boost/spirit/include/qi_symbols.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/spirit/include/qi_symbols.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/unordered_map.hpp b/external/boost/include/boost/unordered_map.hpp new file mode 100644 index 000000000..81964e0c5 --- /dev/null +++ b/external/boost/include/boost/unordered_map.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/unordered_map.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/uuid/uuid_generators.hpp b/external/boost/include/boost/uuid/uuid_generators.hpp new file mode 100644 index 000000000..7b827e36c --- /dev/null +++ b/external/boost/include/boost/uuid/uuid_generators.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/uuid/uuid_generators.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/uuid/uuid_io.hpp b/external/boost/include/boost/uuid/uuid_io.hpp new file mode 100644 index 000000000..a489f9fb1 --- /dev/null +++ b/external/boost/include/boost/uuid/uuid_io.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/uuid/uuid_io.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/variant.hpp b/external/boost/include/boost/variant.hpp new file mode 100644 index 000000000..177b60cf9 --- /dev/null +++ b/external/boost/include/boost/variant.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/variant.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/variant/recursive_variant.hpp b/external/boost/include/boost/variant/recursive_variant.hpp new file mode 100644 index 000000000..43244171b --- /dev/null +++ b/external/boost/include/boost/variant/recursive_variant.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/variant/recursive_variant.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/version.hpp b/external/boost/include/boost/version.hpp new file mode 100644 index 000000000..21d1319ee --- /dev/null +++ b/external/boost/include/boost/version.hpp @@ -0,0 +1,30 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */ +#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang 5 +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/version.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/msvc2017.patch.0 b/external/boost/msvc2017.patch.0 new file mode 100644 index 000000000..4b1002a17 --- /dev/null +++ b/external/boost/msvc2017.patch.0 @@ -0,0 +1,17 @@ +--- boost/iterator.hpp ++++ boost/iterator.hpp +@@ -13,7 +13,14 @@ + namespace boost + { + ++#if defined _MSC_VER && !defined __clang__ ++#pragma warning(push) ++#pragma warning(disable: 4996) ++#endif + using std::iterator; ++#if defined _MSC_VER && !defined __clang__ ++#pragma warning(pop) ++#endif + + } // namespace boost + diff --git a/external/boost/repack_tarball.sh b/external/boost/repack_tarball.sh new file mode 100755 index 000000000..ed27875f6 --- /dev/null +++ b/external/boost/repack_tarball.sh @@ -0,0 +1,60 @@ +#! /bin/sh + +# Repack the boost tarball as xz (much faster to unpack) and remove +# a lot of needless files such as generated html docs. + +tarball="$1" + +if test -z "$tarball" -o ! -f "$tarball"; then + echo "Usage: $0 <tarball>" + exit 1 +fi + +tmpdir=$(mktemp -d) + +if ! test -d "$tmpdir"; then + echo mktemp failed + exit 1 +fi + +echo Unpacking "$tarball" ... +tar x -C "$tmpdir" -f "$tarball" +if test $? -ne 0; then + echo tar x failed + rm -rf "$tmpdir" + exit 1 +fi + +echo Removing unnecessary files ... +find "$tmpdir" \( -name doc -o -name test -o -name example \) -type d -prune -print0 | xargs -0 rm -r +if test $? -ne 0; then + echo file removal failed + rm -rf "$tmpdir" + exit 1 +fi + +name="$(basename "$tarball" | sed 's/\.tar.*$//').tar.xz" +dir=$(ls "$tmpdir") + +echo Creating "$name" ... +# To make the tarball reproducible, use a timestamp of a file inside the tarball (they all seem to have the same mtime). +if ! test -f "$tmpdir/$dir/README.md"; then + echo timestamp retrieval failed, check the script + rm -rf "$tmpdir" + exit 1 +fi +# Many of the options are to make the tarball reproducible. +LC_ALL=C tar c -C "$tmpdir" --xz -f "$(pwd)/$name" --format=gnu --sort=name --owner=0 --group=0 --mode=go=rX,u=rwX --mtime "$tmpdir/$dir/README.md" "$dir" +if test $? -ne 0; then + echo tar c failed + rm -rf "$tmpdir" + exit 1 +fi + +echo Cleaning up ... +rm -rf "$tmpdir" + +sha256sum "$name" + +echo Done. +exit 0 diff --git a/external/boost/rtti.patch.0 b/external/boost/rtti.patch.0 new file mode 100644 index 000000000..249977a68 --- /dev/null +++ b/external/boost/rtti.patch.0 @@ -0,0 +1,13 @@ +Visible function type RTTI for Clang -fsanitize=function + +--- boost/function/function_base.hpp ++++ boost/function/function_base.hpp +@@ -159,7 +159,7 @@ + }; + + // The operation type to perform on the given functor/function pointer +- enum functor_manager_operation_type { ++ enum BOOST_SYMBOL_VISIBLE functor_manager_operation_type { + clone_functor_tag, + move_functor_tag, + destroy_functor_tag, diff --git a/external/boost/windows-no-utf8-locales.patch.0 b/external/boost/windows-no-utf8-locales.patch.0 new file mode 100644 index 000000000..66038cad7 --- /dev/null +++ b/external/boost/windows-no-utf8-locales.patch.0 @@ -0,0 +1,20 @@ +Don't ever attempt to initialise a std::locale with a UTF-8 locale on Windows -*- Mode: Diff -*- + +--- libs/locale/src/std/std_backend.cpp ++++ libs/locale/src/std/std_backend.cpp +@@ -109,12 +109,13 @@ + #endif + } + else { ++ #if !defined(BOOST_WINDOWS) + if(loadable(lid)) { + name_ = lid; + utf_mode_ = utf8_native_with_wide; + } +- #if defined(BOOST_WINDOWS) +- else if(loadable(win_name)) { ++ #else ++ if(loadable(win_name)) { + name_ = win_name; + utf_mode_ = utf8_from_wide; + } diff --git a/external/breakpad/0001-Fix-double-declaration-of-tgkill-when-using-Android-.patch.1 b/external/breakpad/0001-Fix-double-declaration-of-tgkill-when-using-Android-.patch.1 new file mode 100644 index 000000000..7c8a68c24 --- /dev/null +++ b/external/breakpad/0001-Fix-double-declaration-of-tgkill-when-using-Android-.patch.1 @@ -0,0 +1,49 @@ +From 7e3c165000d44fa153a3270870ed500bc8bbb461 Mon Sep 17 00:00:00 2001 +From: Nicholas Baldwin <baldwinn@google.com> +Date: Fri, 27 Oct 2017 11:44:36 -0700 +Subject: [PATCH] Fix double declaration of tgkill when using Android NDK + Headers. + +As of Android API level 16 tgkill is declared in the NDK version of +signal.h, which conflicts with the static definition found in +src/client/linux/handler/exception_handler.cc. This change removes +the static tgkill definition and replaces its use with sys_tgkill +from the linux syscall support library. + +Bug: +Change-Id: Ic70addd8a064cfa36345d86b7e36409e2089e909 +Reviewed-on: https://chromium-review.googlesource.com/738912 +Reviewed-by: Mike Frysinger <vapier@chromium.org> +--- + src/client/linux/handler/exception_handler.cc | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc +index 95005209..cd94e3b5 100644 +--- a/src/client/linux/handler/exception_handler.cc ++++ b/src/client/linux/handler/exception_handler.cc +@@ -105,12 +105,6 @@ + #define PR_SET_PTRACER 0x59616d61 + #endif + +-// A wrapper for the tgkill syscall: send a signal to a specific thread. +-static int tgkill(pid_t tgid, pid_t tid, int sig) { +- return syscall(__NR_tgkill, tgid, tid, sig); +- return 0; +-} +- + namespace google_breakpad { + + namespace { +@@ -400,7 +394,7 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) { + // In order to retrigger it, we have to queue a new signal by calling + // kill() ourselves. The special case (si_pid == 0 && sig == SIGABRT) is + // due to the kernel sending a SIGABRT from a user request via SysRQ. +- if (tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { ++ if (sys_tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { + // If we failed to kill ourselves (e.g. because a sandbox disallows us + // to do so), we instead resort to terminating our process. This will + // result in an incorrect exit code. +-- +2.23.0 + diff --git a/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1 b/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1 new file mode 100644 index 000000000..00762650f --- /dev/null +++ b/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1 @@ -0,0 +1,33 @@ +From caa6f1ea462d0f0c612b871106e3e309fe0290f5 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Thu, 16 Aug 2018 09:04:35 +0200 +Subject: [PATCH] Handle race between ExceptionHandler::SignalHandler and + ~ExceptionHandler + +...where thread A is blocked locking g_handler_stack_mutex_ in SignalHandler +while thread B executes ~ExceptionHandler and sets g_handler_stack to null, but +which thread A didn't expect to be null once it acquired the lock. +--- + src/client/linux/handler/exception_handler.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc +index b895f6d7..4d58e510 100644 +--- a/src/client/linux/handler/exception_handler.cc ++++ b/src/client/linux/handler/exception_handler.cc +@@ -372,8 +372,10 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) { + } + + bool handled = false; +- for (int i = g_handler_stack_->size() - 1; !handled && i >= 0; --i) { +- handled = (*g_handler_stack_)[i]->HandleSignal(sig, info, uc); ++ if (g_handler_stack_ != NULL) { ++ for (int i = g_handler_stack_->size() - 1; !handled && i >= 0; --i) { ++ handled = (*g_handler_stack_)[i]->HandleSignal(sig, info, uc); ++ } + } + + // Upon returning from this signal handler, sig will become unmasked and then +-- +2.17.1 + diff --git a/external/breakpad/ExternalProject_breakpad.mk b/external/breakpad/ExternalProject_breakpad.mk new file mode 100644 index 000000000..9e7e72485 --- /dev/null +++ b/external/breakpad/ExternalProject_breakpad.mk @@ -0,0 +1,31 @@ +# -*- 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,breakpad)) + +$(eval $(call gb_ExternalProject_register_targets,breakpad,\ + build \ +)) + + +ifeq ($(COM),MSC) + +else # !ifeq($(COM),MSC) + +$(call gb_ExternalProject_get_state_target,breakpad,build) : + $(call gb_Trace_StartRange,breakpad,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure CXXFLAGS="-O2 $(gb_VISIBILITY_FLAGS)" \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,breakpad,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/breakpad/Makefile b/external/breakpad/Makefile new file mode 100644 index 000000000..569ad8a0b --- /dev/null +++ b/external/breakpad/Makefile @@ -0,0 +1,14 @@ +# -*- 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/. +# + +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/breakpad/Module_breakpad.mk b/external/breakpad/Module_breakpad.mk new file mode 100644 index 000000000..aeb3c42a9 --- /dev/null +++ b/external/breakpad/Module_breakpad.mk @@ -0,0 +1,26 @@ +# -*- 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,breakpad)) + +$(eval $(call gb_Module_add_targets,breakpad,\ + UnpackedTarball_breakpad \ +)) + +ifneq ($(OS),WNT) +$(eval $(call gb_Module_add_targets,breakpad,\ + ExternalProject_breakpad \ +)) +else +$(eval $(call gb_Module_add_targets,breakpad,\ + StaticLibrary_breakpad \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/breakpad/README b/external/breakpad/README new file mode 100644 index 000000000..dfd2bf91c --- /dev/null +++ b/external/breakpad/README @@ -0,0 +1,21 @@ +Google breakpad crash-reporting library + +https://chromium.googlesource.com/breakpad/breakpad + +When this is enabled and soffice.bin crashes, a "mini-dump" file is written +as "instdir/crash/*.dmp". + +There is an UI to upload the mini-dump to a TDF server but of course +that only makes sense if the server has symbols available that match +the build, which is not the case if you have built LO yourself. + +If you want to get the backtrace from local mini-dump files: + +* with Visual Studio: + 1. open the *.dmp file from the Visual Studio IDE File->Open->File + 2. then click "Debug Native Only" + +* otherwise: + 1. run "make symbols" to extract the debuginfo from the binaries + 2. run "workdir/UnpackedTarball/breakpad/src/processor/minidump_stackwalk foo.dmp workdir/symbols" + diff --git a/external/breakpad/StaticLibrary_breakpad.mk b/external/breakpad/StaticLibrary_breakpad.mk new file mode 100644 index 000000000..fc5d3251f --- /dev/null +++ b/external/breakpad/StaticLibrary_breakpad.mk @@ -0,0 +1,37 @@ +# -*- 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_StaticLibrary_StaticLibrary,breakpad)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,breakpad)) + +$(eval $(call gb_StaticLibrary_use_unpacked,breakpad,breakpad)) + +$(eval $(call gb_StaticLibrary_set_include,breakpad,\ + -I$(call gb_UnpackedTarball_get_dir,breakpad)/src \ + -I$(call gb_UnpackedTarball_get_dir,breakpad)/src/client/windows \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_defs,breakpad,\ + -DUNICODE \ +)) + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,breakpad,cc)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,breakpad,\ + UnpackedTarball/breakpad/src/common/windows/guid_string \ + UnpackedTarball/breakpad/src/client/windows/handler/exception_handler \ + UnpackedTarball/breakpad/src/client/windows/crash_generation/client_info \ + UnpackedTarball/breakpad/src/client/windows/crash_generation/crash_generation_client \ + UnpackedTarball/breakpad/src/client/windows/crash_generation/crash_generation_server \ + UnpackedTarball/breakpad/src/client/windows/crash_generation/minidump_generator \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/breakpad/UnpackedTarball_breakpad.mk b/external/breakpad/UnpackedTarball_breakpad.mk new file mode 100644 index 000000000..b9e14874d --- /dev/null +++ b/external/breakpad/UnpackedTarball_breakpad.mk @@ -0,0 +1,38 @@ +# -*- 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,breakpad)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,breakpad,0)) + +$(eval $(call gb_UnpackedTarball_set_tarball,breakpad,$(BREAKPAD_TARBALL))) + +# external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch upstreamed at +# <https://chromium-review.googlesource.com/c/breakpad/breakpad/+/1176811> "Handle race between +# ExceptionHandler::SignalHandler and ~ExceptionHandler": +$(eval $(call gb_UnpackedTarball_add_patches,breakpad,\ + external/breakpad/breakpad-use-correct-http-header.patch.1 \ + external/breakpad/breakpad-wshadow.patch.1 \ + external/breakpad/breakpad-wshadow2.patch.1 \ + external/breakpad/breakpad-stackwalk.patch.1 \ + external/breakpad/ucontext.patch \ + external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1 \ + external/breakpad/0001-Fix-double-declaration-of-tgkill-when-using-Android-.patch.1 \ + external/breakpad/c++20-allocator.patch \ +)) + +ifeq ($(COM_IS_CLANG),TRUE) +ifneq ($(filter -fsanitize=%,$(CC)),) +$(eval $(call gb_UnpackedTarball_add_patches,breakpad, \ + external/breakpad/ubsan.patch \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/breakpad/breakpad-stackwalk.patch.1 b/external/breakpad/breakpad-stackwalk.patch.1 new file mode 100644 index 000000000..8df1fa3e2 --- /dev/null +++ b/external/breakpad/breakpad-stackwalk.patch.1 @@ -0,0 +1,32 @@ +diff -ur breakpad.org/src/processor/stackwalk_common.cc breakpad/src/processor/stackwalk_common.cc +--- breakpad.org/src/processor/stackwalk_common.cc 2016-06-27 02:06:43.304932691 +0200 ++++ breakpad/src/processor/stackwalk_common.cc 2016-06-27 02:10:22.815642476 +0200 +@@ -750,7 +750,7 @@ + // one per line, in the following machine-readable pipe-delimited + // text format: + // Module|{Module Filename}|{Version}|{Debug Filename}|{Debug Identifier}| +-// {Base Address}|{Max Address}|{Main} ++// {Base Address}|{Max Address}|{Main}|{Code Identifier} + static void PrintModulesMachineReadable(const CodeModules *modules) { + if (!modules) + return; +@@ -767,7 +767,7 @@ + ++module_sequence) { + const CodeModule *module = modules->GetModuleAtSequence(module_sequence); + uint64_t base_address = module->base_address(); +- printf("Module%c%s%c%s%c%s%c%s%c0x%08" PRIx64 "%c0x%08" PRIx64 "%c%d\n", ++ printf("Module%c%s%c%s%c%s%c%s%c0x%08" PRIx64 "%c0x%08" PRIx64 "%c%d%c%s\n", + kOutputSeparator, + StripSeparator(PathnameStripper::File(module->code_file())).c_str(), + kOutputSeparator, StripSeparator(module->version()).c_str(), +@@ -778,7 +778,9 @@ + kOutputSeparator, base_address, + kOutputSeparator, base_address + module->size() - 1, + kOutputSeparator, +- main_module != NULL && base_address == main_address ? 1 : 0); ++ main_module != NULL && base_address == main_address ? 1 : 0, ++ kOutputSeparator, ++ StripSeparator(PathnameStripper::File(module->code_identifier())).c_str()); + } + } + diff --git a/external/breakpad/breakpad-use-correct-http-header.patch.1 b/external/breakpad/breakpad-use-correct-http-header.patch.1 new file mode 100644 index 000000000..257d5465b --- /dev/null +++ b/external/breakpad/breakpad-use-correct-http-header.patch.1 @@ -0,0 +1,14 @@ +diff -ur breakpad.org/src/tools/linux/symupload/minidump_upload.cc breakpad/src/tools/linux/symupload/minidump_upload.cc +--- breakpad.org/src/tools/linux/symupload/minidump_upload.cc 2015-11-23 17:37:53.830558138 +0100 ++++ breakpad/src/tools/linux/symupload/minidump_upload.cc 2015-11-23 17:38:59.559051874 +0100 +@@ -59,8 +59,8 @@ + static void Start(Options *options) { + std::map<string, string> parameters; + // Add parameters +- parameters["prod"] = options->product; +- parameters["ver"] = options->version; ++ parameters["ProductName"] = options->product; ++ parameters["Version"] = options->version; + + std::map<string, string> files; + files["upload_file_minidump"] = options->minidumpPath; diff --git a/external/breakpad/breakpad-wshadow.patch.1 b/external/breakpad/breakpad-wshadow.patch.1 new file mode 100644 index 000000000..d696e5bde --- /dev/null +++ b/external/breakpad/breakpad-wshadow.patch.1 @@ -0,0 +1,232 @@ +Only in breakpad: breakpad-client.pc +Only in breakpad: breakpad.pc +Only in breakpad: build.log +Only in breakpad: config.log +Only in breakpad: config.status +Only in breakpad: Makefile +Only in breakpad/src/client: .deps +Only in breakpad/src/client: .dirstamp +Only in breakpad/src/client/linux/crash_generation: crash_generation_client.o +Only in breakpad/src/client/linux/crash_generation: crash_generation_server.o +Only in breakpad/src/client/linux/crash_generation: .deps +Only in breakpad/src/client/linux/crash_generation: .dirstamp +Only in breakpad/src/client/linux: .dirstamp +Only in breakpad/src/client/linux/dump_writer_common: .deps +Only in breakpad/src/client/linux/dump_writer_common: .dirstamp +Only in breakpad/src/client/linux/dump_writer_common: thread_info.o +Only in breakpad/src/client/linux/dump_writer_common: ucontext_reader.o +Only in breakpad/src/client/linux/handler: .deps +Only in breakpad/src/client/linux/handler: .dirstamp +Only in breakpad/src/client/linux/handler: exception_handler.o +diff -ur breakpad.org/src/client/linux/handler/minidump_descriptor.h breakpad/src/client/linux/handler/minidump_descriptor.h +--- breakpad.org/src/client/linux/handler/minidump_descriptor.h 2016-02-07 19:22:24.329411023 +0100 ++++ breakpad/src/client/linux/handler/minidump_descriptor.h 2016-02-07 19:24:28.600438386 +0100 +@@ -55,18 +55,18 @@ + fd_(-1), + size_limit_(-1) {} + +- explicit MinidumpDescriptor(const string& directory) ++ explicit MinidumpDescriptor(const string& dir) + : mode_(kWriteMinidumpToFile), + fd_(-1), +- directory_(directory), ++ directory_(dir), + c_path_(NULL), + size_limit_(-1) { + assert(!directory.empty()); + } + +- explicit MinidumpDescriptor(int fd) ++ explicit MinidumpDescriptor(int file_descriptor) + : mode_(kWriteMinidumpToFd), +- fd_(fd), ++ fd_(file_descriptor), + c_path_(NULL), + size_limit_(-1) { + assert(fd != -1); +Only in breakpad/src/client/linux/handler: .minidump_descriptor.h.un~ +Only in breakpad/src/client/linux/handler: minidump_descriptor.o +Only in breakpad/src/client/linux: libbreakpad_client.a +Only in breakpad/src/client/linux: linux_dumper_unittest_helper +Only in breakpad/src/client/linux/log: .deps +Only in breakpad/src/client/linux/log: .dirstamp +Only in breakpad/src/client/linux/log: log.o +Only in breakpad/src/client/linux/microdump_writer: .deps +Only in breakpad/src/client/linux/microdump_writer: .dirstamp +Only in breakpad/src/client/linux/microdump_writer: microdump_writer.o +Only in breakpad/src/client/linux/minidump_writer: .deps +Only in breakpad/src/client/linux/minidump_writer: .dirstamp +Only in breakpad/src/client/linux/minidump_writer: linux_core_dumper.o +diff -ur breakpad.org/src/client/linux/minidump_writer/linux_dumper.h breakpad/src/client/linux/minidump_writer/linux_dumper.h +--- breakpad.org/src/client/linux/minidump_writer/linux_dumper.h 2016-02-07 19:22:24.330410999 +0100 ++++ breakpad/src/client/linux/minidump_writer/linux_dumper.h 2016-02-07 19:26:10.870017835 +0100 +@@ -130,15 +130,15 @@ + uint8_t identifier[sizeof(MDGUID)]); + + uintptr_t crash_address() const { return crash_address_; } +- void set_crash_address(uintptr_t crash_address) { +- crash_address_ = crash_address; ++ void set_crash_address(uintptr_t crash_addr) { ++ crash_address_ = crash_addr; + } + + int crash_signal() const { return crash_signal_; } +- void set_crash_signal(int crash_signal) { crash_signal_ = crash_signal; } ++ void set_crash_signal(int crash_sig) { crash_signal_ = crash_sig; } + + pid_t crash_thread() const { return crash_thread_; } +- void set_crash_thread(pid_t crash_thread) { crash_thread_ = crash_thread; } ++ void set_crash_thread(pid_t thread) { crash_thread_ = thread; } + + // Extracts the effective path and file name of from |mapping|. In most cases + // the effective name/path are just the mapping's path and basename. In some +Only in breakpad/src/client/linux/minidump_writer: .linux_dumper.h.un~ +Only in breakpad/src/client/linux/minidump_writer: linux_dumper.o +Only in breakpad/src/client/linux/minidump_writer: linux_ptrace_dumper.o +Only in breakpad/src/client/linux/minidump_writer: minidump_writer.o +Only in breakpad/src/client/linux/minidump_writer: src_client_linux_linux_dumper_unittest_helper-linux_dumper_unittest_helper.o +Only in breakpad/src/client: minidump_file_writer.o +Only in breakpad/src/common/android: .deps +Only in breakpad/src/common: convert_UTF.o +Only in breakpad/src/common: .deps +Only in breakpad/src/common: .dirstamp +Only in breakpad/src/common/dwarf: bytereader.o +Only in breakpad/src/common/dwarf: .deps +Only in breakpad/src/common/dwarf: .dirstamp +Only in breakpad/src/common/dwarf: dwarf2diehandler.o +Only in breakpad/src/common/dwarf: dwarf2reader.o +Only in breakpad/src/common/dwarf: src_tools_mac_dump_syms_dump_syms-bytereader.o +Only in breakpad/src/common/dwarf: src_tools_mac_dump_syms_dump_syms-dwarf2diehandler.o +Only in breakpad/src/common/dwarf: src_tools_mac_dump_syms_dump_syms-dwarf2reader.o +Only in breakpad/src/common: dwarf_cfi_to_module.o +Only in breakpad/src/common: dwarf_cu_to_module.o +Only in breakpad/src/common: dwarf_line_to_module.o +Only in breakpad/src/common: language.o +Only in breakpad/src/common/linux: crc32.o +Only in breakpad/src/common/linux: .deps +Only in breakpad/src/common/linux: .dirstamp +Only in breakpad/src/common/linux: dump_symbols.o +Only in breakpad/src/common/linux: elf_core_dump.o +Only in breakpad/src/common/linux: elf_symbols_to_module.o +Only in breakpad/src/common/linux: elfutils.o +Only in breakpad/src/common/linux: file_id.o +Only in breakpad/src/common/linux: guid_creator.o +Only in breakpad/src/common/linux: http_upload.o +Only in breakpad/src/common/linux: linux_libc_support.o +Only in breakpad/src/common/linux: memory_mapped_file.o +Only in breakpad/src/common/linux: safe_readlink.o +Only in breakpad/src/common/linux/tests: .deps +Only in breakpad/src/common/mac: .deps +Only in breakpad/src/common/mac: .dirstamp +Only in breakpad/src/common/mac: src_tools_mac_dump_syms_dump_syms-arch_utilities.o +Only in breakpad/src/common/mac: src_tools_mac_dump_syms_dump_syms-dump_syms.o +Only in breakpad/src/common/mac: src_tools_mac_dump_syms_dump_syms-file_id.o +Only in breakpad/src/common/mac: src_tools_mac_dump_syms_dump_syms-macho_id.o +Only in breakpad/src/common/mac: src_tools_mac_dump_syms_dump_syms-macho_reader.o +Only in breakpad/src/common/mac: src_tools_mac_dump_syms_dump_syms-macho_utilities.o +Only in breakpad/src/common/mac: src_tools_mac_dump_syms_dump_syms-macho_walker.o +Only in breakpad/src/common: md5.o +Only in breakpad/src/common: module.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-dwarf_cfi_to_module.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-dwarf_cu_to_module.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-dwarf_line_to_module.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-language.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-md5.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-module.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-stabs_reader.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-stabs_to_module.o +Only in breakpad/src/common: stabs_reader.o +Only in breakpad/src/common: stabs_to_module.o +Only in breakpad/src/common: string_conversion.o +Only in breakpad/src/common/tests: .deps +Only in breakpad/src: config.h +Only in breakpad/src: .dirstamp +Only in breakpad/src: libbreakpad.a +Only in breakpad/src/processor: basic_code_modules.o +Only in breakpad/src/processor: basic_source_line_resolver.o +Only in breakpad/src/processor: call_stack.o +Only in breakpad/src/processor: cfi_frame_info.o +Only in breakpad/src/processor: .deps +Only in breakpad/src/processor: .dirstamp +Only in breakpad/src/processor: disassembler_x86.o +Only in breakpad/src/processor: dump_context.o +Only in breakpad/src/processor: dump_object.o +Only in breakpad/src/processor: exploitability_linux.o +Only in breakpad/src/processor: exploitability.o +Only in breakpad/src/processor: exploitability_win.o +Only in breakpad/src/processor: fast_source_line_resolver.o +Only in breakpad/src/processor: logging.o +Only in breakpad/src/processor: microdump.o +Only in breakpad/src/processor: microdump_processor.o +Only in breakpad/src/processor: microdump_stackwalk +Only in breakpad/src/processor: microdump_stackwalk.o +Only in breakpad/src/processor: minidump_dump +Only in breakpad/src/processor: minidump_dump.o +Only in breakpad/src/processor: minidump.o +Only in breakpad/src/processor: minidump_processor.o +Only in breakpad/src/processor: minidump_stackwalk +Only in breakpad/src/processor: minidump_stackwalk.o +Only in breakpad/src/processor: module_comparer.o +Only in breakpad/src/processor: module_serializer.o +Only in breakpad/src/processor: pathname_stripper.o +Only in breakpad/src/processor: process_state.o +Only in breakpad/src/processor: proc_maps_linux.o +Only in breakpad/src/processor: simple_symbol_supplier.o +Only in breakpad/src/processor: source_line_resolver_base.o +Only in breakpad/src/processor: stack_frame_cpu.o +Only in breakpad/src/processor: stack_frame_symbolizer.o +Only in breakpad/src/processor: stackwalk_common.o +Only in breakpad/src/processor: stackwalker_address_list.o +Only in breakpad/src/processor: stackwalker_amd64.o +Only in breakpad/src/processor: stackwalker_arm64.o +Only in breakpad/src/processor: stackwalker_arm.o +Only in breakpad/src/processor: stackwalker_mips.o +Only in breakpad/src/processor: stackwalker.o +Only in breakpad/src/processor: stackwalker_ppc64.o +Only in breakpad/src/processor: stackwalker_ppc.o +Only in breakpad/src/processor: stackwalker_sparc.o +Only in breakpad/src/processor: stackwalker_x86.o +Only in breakpad/src/processor: symbolic_constants_win.o +Only in breakpad/src/processor: tokenize.o +Only in breakpad/src: stamp-h1 +Only in breakpad/src/testing/gtest/src: .deps +Only in breakpad/src/testing/src: .deps +Only in breakpad/src/third_party/libdisasm: .deps +Only in breakpad/src/third_party/libdisasm: .dirstamp +Only in breakpad/src/third_party/libdisasm: ia32_implicit.o +Only in breakpad/src/third_party/libdisasm: ia32_insn.o +Only in breakpad/src/third_party/libdisasm: ia32_invariant.o +Only in breakpad/src/third_party/libdisasm: ia32_modrm.o +Only in breakpad/src/third_party/libdisasm: ia32_opcode_tables.o +Only in breakpad/src/third_party/libdisasm: ia32_operand.o +Only in breakpad/src/third_party/libdisasm: ia32_reg.o +Only in breakpad/src/third_party/libdisasm: ia32_settings.o +Only in breakpad/src/third_party/libdisasm: libdisasm.a +Only in breakpad/src/third_party/libdisasm: x86_disasm.o +Only in breakpad/src/third_party/libdisasm: x86_format.o +Only in breakpad/src/third_party/libdisasm: x86_imm.o +Only in breakpad/src/third_party/libdisasm: x86_insn.o +Only in breakpad/src/third_party/libdisasm: x86_misc.o +Only in breakpad/src/third_party/libdisasm: x86_operand_list.o +Only in breakpad/src/tools/linux/core2md: core2md +Only in breakpad/src/tools/linux/core2md: core2md.o +Only in breakpad/src/tools/linux/core2md: .deps +Only in breakpad/src/tools/linux/core2md: .dirstamp +Only in breakpad/src/tools/linux/dump_syms: .deps +Only in breakpad/src/tools/linux/dump_syms: .dirstamp +Only in breakpad/src/tools/linux/dump_syms: dump_syms +Only in breakpad/src/tools/linux/dump_syms: dump_syms.o +Only in breakpad/src/tools/linux/md2core: .deps +Only in breakpad/src/tools/linux/md2core: .dirstamp +Only in breakpad/src/tools/linux/md2core: minidump-2-core +Only in breakpad/src/tools/linux/md2core: minidump-2-core.o +Only in breakpad/src/tools/linux/symupload: .deps +Only in breakpad/src/tools/linux/symupload: .dirstamp +Only in breakpad/src/tools/linux/symupload: minidump_upload +Only in breakpad/src/tools/linux/symupload: minidump_upload.o +Only in breakpad/src/tools/linux/symupload: sym_upload +Only in breakpad/src/tools/linux/symupload: sym_upload.o +Only in breakpad/src/tools/mac/dump_syms: .deps +Only in breakpad/src/tools/mac/dump_syms: .dirstamp +Only in breakpad/src/tools/mac/dump_syms: dump_syms +Only in breakpad/src/tools/mac/dump_syms: src_tools_mac_dump_syms_dump_syms-dump_syms_tool.o diff --git a/external/breakpad/breakpad-wshadow2.patch.1 b/external/breakpad/breakpad-wshadow2.patch.1 new file mode 100644 index 000000000..40267b3f7 --- /dev/null +++ b/external/breakpad/breakpad-wshadow2.patch.1 @@ -0,0 +1,144 @@ +Only in breakpad: breakpad-client.pc +Only in breakpad: breakpad.pc +Only in breakpad: build.log +Only in breakpad: config.log +Only in breakpad: config.status +Only in breakpad: Makefile +Only in breakpad/src/client: .deps +Only in breakpad/src/client: .dirstamp +Only in breakpad/src/client/linux/crash_generation: crash_generation_client.o +Only in breakpad/src/client/linux/crash_generation: .deps +Only in breakpad/src/client/linux/crash_generation: .dirstamp +Only in breakpad/src/client/linux: .dirstamp +Only in breakpad/src/client/linux/dump_writer_common: .deps +Only in breakpad/src/client/linux/dump_writer_common: .dirstamp +Only in breakpad/src/client/linux/dump_writer_common: thread_info.o +Only in breakpad/src/client/linux/dump_writer_common: ucontext_reader.o +Only in breakpad/src/client/linux/handler: .deps +Only in breakpad/src/client/linux/handler: .dirstamp +diff -ur breakpad.org/src/client/linux/handler/minidump_descriptor.h breakpad/src/client/linux/handler/minidump_descriptor.h +--- breakpad.org/src/client/linux/handler/minidump_descriptor.h 2016-02-07 19:28:40.335518286 +0100 ++++ breakpad/src/client/linux/handler/minidump_descriptor.h 2016-02-07 19:29:14.706713302 +0100 +@@ -61,7 +61,7 @@ + directory_(dir), + c_path_(NULL), + size_limit_(-1) { +- assert(!directory.empty()); ++ assert(!dir.empty()); + } + + explicit MinidumpDescriptor(int file_descriptor) +@@ -69,7 +69,7 @@ + fd_(file_descriptor), + c_path_(NULL), + size_limit_(-1) { +- assert(fd != -1); ++ assert(file_descriptor != -1); + } + + explicit MinidumpDescriptor(const MicrodumpOnConsole&) +Only in breakpad/src/client/linux/handler: .minidump_descriptor.h.un~ +Only in breakpad/src/client/linux/log: .deps +Only in breakpad/src/client/linux/log: .dirstamp +Only in breakpad/src/client/linux/log: log.o +Only in breakpad/src/client/linux/microdump_writer: .deps +Only in breakpad/src/client/linux/microdump_writer: .dirstamp +Only in breakpad/src/client/linux/minidump_writer: .deps +Only in breakpad/src/client/linux/minidump_writer: .dirstamp +Only in breakpad/src/client/linux/minidump_writer: linux_dumper.o +Only in breakpad/src/client/linux/minidump_writer: linux_ptrace_dumper.o +Only in breakpad/src/client: minidump_file_writer.o +Only in breakpad/src/common/android: .deps +Only in breakpad/src/common: convert_UTF.o +Only in breakpad/src/common: .deps +Only in breakpad/src/common: .dirstamp +Only in breakpad/src/common/dwarf: .deps +Only in breakpad/src/common/dwarf: .dirstamp +Only in breakpad/src/common/dwarf: src_tools_mac_dump_syms_dump_syms-bytereader.o +Only in breakpad/src/common/dwarf: src_tools_mac_dump_syms_dump_syms-dwarf2diehandler.o +Only in breakpad/src/common/dwarf: src_tools_mac_dump_syms_dump_syms-dwarf2reader.o +Only in breakpad/src/common: dwarf_cfi_to_module.o +Only in breakpad/src/common: dwarf_cu_to_module.o +Only in breakpad/src/common: dwarf_line_to_module.o +Only in breakpad/src/common: language.o +Only in breakpad/src/common/linux: crc32.o +Only in breakpad/src/common/linux: .deps +Only in breakpad/src/common/linux: .dirstamp +Only in breakpad/src/common/linux: dump_symbols.o +Only in breakpad/src/common/linux: elf_symbols_to_module.o +Only in breakpad/src/common/linux: http_upload.o +Only in breakpad/src/common/linux/tests: .deps +Only in breakpad/src/common/mac: .deps +Only in breakpad/src/common/mac: .dirstamp +Only in breakpad/src/common: module.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-dwarf_cfi_to_module.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-dwarf_cu_to_module.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-dwarf_line_to_module.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-language.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-md5.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-module.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-stabs_reader.o +Only in breakpad/src/common: src_tools_mac_dump_syms_dump_syms-stabs_to_module.o +Only in breakpad/src/common: stabs_reader.o +Only in breakpad/src/common: stabs_to_module.o +Only in breakpad/src/common/tests: .deps +Only in breakpad/src: config.h +Only in breakpad/src: .dirstamp +Only in breakpad/src/processor: basic_code_modules.o +Only in breakpad/src/processor: basic_source_line_resolver.o +Only in breakpad/src/processor: call_stack.o +Only in breakpad/src/processor: cfi_frame_info.o +Only in breakpad/src/processor: .deps +Only in breakpad/src/processor: .dirstamp +Only in breakpad/src/processor: disassembler_x86.o +Only in breakpad/src/processor: dump_context.o +Only in breakpad/src/processor: dump_object.o +Only in breakpad/src/processor: exploitability_linux.o +Only in breakpad/src/processor: exploitability.o +Only in breakpad/src/processor: exploitability_win.o +Only in breakpad/src/processor: fast_source_line_resolver.o +Only in breakpad/src/processor: logging.o +Only in breakpad/src/processor: microdump.o +Only in breakpad/src/processor: microdump_processor.o +Only in breakpad/src/processor: microdump_stackwalk.o +Only in breakpad/src/processor: minidump_dump.o +Only in breakpad/src/processor: minidump.o +Only in breakpad/src/processor: minidump_processor.o +Only in breakpad/src/processor: minidump_stackwalk.o +Only in breakpad/src/processor: module_comparer.o +Only in breakpad/src/processor: module_serializer.o +Only in breakpad/src/processor: pathname_stripper.o +Only in breakpad/src/processor: process_state.o +Only in breakpad/src/processor: proc_maps_linux.o +Only in breakpad/src/processor: simple_symbol_supplier.o +Only in breakpad/src/processor: source_line_resolver_base.o +Only in breakpad/src/processor: stack_frame_cpu.o +Only in breakpad/src/processor: stack_frame_symbolizer.o +Only in breakpad/src/processor: stackwalk_common.o +Only in breakpad/src/processor: stackwalker_address_list.o +Only in breakpad/src/processor: stackwalker_amd64.o +Only in breakpad/src/processor: stackwalker_arm64.o +Only in breakpad/src/processor: stackwalker_arm.o +Only in breakpad/src/processor: stackwalker_mips.o +Only in breakpad/src/processor: stackwalker.o +Only in breakpad/src/processor: stackwalker_ppc64.o +Only in breakpad/src/processor: stackwalker_ppc.o +Only in breakpad/src/processor: stackwalker_sparc.o +Only in breakpad/src/processor: stackwalker_x86.o +Only in breakpad/src/processor: symbolic_constants_win.o +Only in breakpad/src/processor: tokenize.o +Only in breakpad/src: stamp-h1 +Only in breakpad/src/testing/gtest/src: .deps +Only in breakpad/src/testing/src: .deps +Only in breakpad/src/third_party/libdisasm: .deps +Only in breakpad/src/third_party/libdisasm: .dirstamp +Only in breakpad/src/tools/linux/core2md: .deps +Only in breakpad/src/tools/linux/core2md: .dirstamp +Only in breakpad/src/tools/linux/dump_syms: .deps +Only in breakpad/src/tools/linux/dump_syms: .dirstamp +Only in breakpad/src/tools/linux/md2core: .deps +Only in breakpad/src/tools/linux/md2core: .dirstamp +Only in breakpad/src/tools/linux/symupload: .deps +Only in breakpad/src/tools/linux/symupload: .dirstamp +Only in breakpad/src/tools/mac/dump_syms: .deps +Only in breakpad/src/tools/mac/dump_syms: .dirstamp diff --git a/external/breakpad/c++20-allocator.patch b/external/breakpad/c++20-allocator.patch new file mode 100644 index 000000000..588d7db4d --- /dev/null +++ b/external/breakpad/c++20-allocator.patch @@ -0,0 +1,11 @@ +--- src/common/memory.h ++++ src/common/memory.h +@@ -162,7 +162,7 @@ + // Wrapper to use with STL containers + template <typename T> + struct PageStdAllocator : public std::allocator<T> { +- typedef typename std::allocator<T>::pointer pointer; ++ typedef T* pointer; + typedef typename std::allocator<T>::size_type size_type; + + explicit PageStdAllocator(PageAllocator& allocator): allocator_(allocator) {} diff --git a/external/breakpad/ubsan.patch b/external/breakpad/ubsan.patch new file mode 100644 index 000000000..f4204516e --- /dev/null +++ b/external/breakpad/ubsan.patch @@ -0,0 +1,21 @@ +--- src/client/linux/minidump_writer/directory_reader.h ++++ src/client/linux/minidump_writer/directory_reader.h +@@ -96,7 +96,7 @@ + const int fd_; + bool hit_eof_; + unsigned buf_used_; +- uint8_t buf_[sizeof(struct kernel_dirent) + NAME_MAX + 1]; ++ uint8_t buf_[sizeof(struct kernel_dirent) + NAME_MAX + 1] __attribute__ ((aligned (__BIGGEST_ALIGNMENT__))); + }; + + } // namespace google_breakpad +--- src/common/memory.h ++++ src/common/memory.h +@@ -75,6 +75,7 @@ + if (!bytes) + return NULL; + ++ bytes = (bytes + (__BIGGEST_ALIGNMENT__ - 1)) & ~(__BIGGEST_ALIGNMENT__ - 1); + if (current_page_ && page_size_ - page_offset_ >= bytes) { + uint8_t *const ret = current_page_ + page_offset_; + page_offset_ += bytes; diff --git a/external/breakpad/ucontext.patch b/external/breakpad/ucontext.patch new file mode 100644 index 000000000..a108ae11c --- /dev/null +++ b/external/breakpad/ucontext.patch @@ -0,0 +1,194 @@ +--- src/client/linux/dump_writer_common/ucontext_reader.cc ++++ src/client/linux/dump_writer_common/ucontext_reader.cc +@@ -40,15 +40,15 @@ + + #if defined(__i386__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_ESP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_EIP]; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fp) { + const greg_t* regs = uc->uc_mcontext.gregs; + +@@ -88,15 +88,15 @@ + + #elif defined(__x86_64) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_RSP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_RIP]; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fpregs) { + const greg_t* regs = uc->uc_mcontext.gregs; + +@@ -145,15 +145,15 @@ + + #elif defined(__ARM_EABI__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.arm_sp; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.arm_pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { + out->context_flags = MD_CONTEXT_ARM_FULL; + + out->iregs[0] = uc->uc_mcontext.arm_r0; +@@ -184,15 +184,15 @@ + + #elif defined(__aarch64__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.sp; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct fpsimd_context* fpregs) { + out->context_flags = MD_CONTEXT_ARM64_FULL; + +@@ -210,15 +210,15 @@ + + #elif defined(__mips__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { + out->context_flags = MD_CONTEXT_MIPS_FULL; + + for (int i = 0; i < MD_CONTEXT_MIPS_GPR_COUNT; ++i) +--- src/client/linux/dump_writer_common/ucontext_reader.h ++++ src/client/linux/dump_writer_common/ucontext_reader.h +@@ -41,21 +41,21 @@ + + // Wraps platform-dependent implementations of accessors to ucontext structs. + struct UContextReader { +- static uintptr_t GetStackPointer(const struct ucontext* uc); ++ static uintptr_t GetStackPointer(const ucontext_t* uc); + +- static uintptr_t GetInstructionPointer(const struct ucontext* uc); ++ static uintptr_t GetInstructionPointer(const ucontext_t* uc); + + // Juggle a arch-specific ucontext into a minidump format + // out: the minidump structure + // info: the collection of register structures. + #if defined(__i386__) || defined(__x86_64) +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fp); + #elif defined(__aarch64__) +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct fpsimd_context* fpregs); + #else +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); + #endif + }; + +--- src/client/linux/handler/exception_handler.cc ++++ src/client/linux/handler/exception_handler.cc +@@ -439,9 +439,9 @@ + // Fill in all the holes in the struct to make Valgrind happy. + memset(&g_crash_context_, 0, sizeof(g_crash_context_)); + memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); +- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); ++ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); + #if defined(__aarch64__) +- struct ucontext* uc_ptr = (struct ucontext*)uc; ++ ucontext_t* uc_ptr = (ucontext_t*)uc; + struct fpsimd_context* fp_ptr = + (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; + if (fp_ptr->head.magic == FPSIMD_MAGIC) { +@@ -450,9 +450,9 @@ + } + #elif !defined(__ARM_EABI__) && !defined(__mips__) + // FP state is not part of user ABI on ARM Linux. +- // In case of MIPS Linux FP state is already part of struct ucontext ++ // In case of MIPS Linux FP state is already part of ucontext_t + // and 'float_state' is not a member of CrashContext. +- struct ucontext* uc_ptr = (struct ucontext*)uc; ++ ucontext_t* uc_ptr = (ucontext_t*)uc; + if (uc_ptr->uc_mcontext.fpregs) { + memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, + sizeof(g_crash_context_.float_state)); +@@ -476,7 +476,7 @@ + // ExceptionHandler::HandleSignal(). + siginfo.si_code = SI_USER; + siginfo.si_pid = getpid(); +- struct ucontext context; ++ ucontext_t context; + getcontext(&context); + return HandleSignal(sig, &siginfo, &context); + } +--- src/client/linux/handler/exception_handler.h ++++ src/client/linux/handler/exception_handler.h +@@ -191,7 +191,7 @@ + struct CrashContext { + siginfo_t siginfo; + pid_t tid; // the crashing thread. +- struct ucontext context; ++ ucontext_t context; + #if !defined(__ARM_EABI__) && !defined(__mips__) + // #ifdef this out because FP state is not part of user ABI for Linux ARM. + // In case of MIPS Linux FP state is already part of struct +--- src/client/linux/microdump_writer/microdump_writer.cc ++++ src/client/linux/microdump_writer/microdump_writer.cc +@@ -395,7 +395,7 @@ + + void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } + +- const struct ucontext* const ucontext_; ++ const ucontext_t* const ucontext_; + #if !defined(__ARM_EABI__) && !defined(__mips__) + const google_breakpad::fpstate_t* const float_state_; + #endif +--- src/client/linux/minidump_writer/minidump_writer.cc ++++ src/client/linux/minidump_writer/minidump_writer.cc +@@ -1238,7 +1238,7 @@ + const int fd_; // File descriptor where the minidum should be written. + const char* path_; // Path to the file where the minidum should be written. + +- const struct ucontext* const ucontext_; // also from the signal handler ++ const ucontext_t* const ucontext_; // also from the signal handler + #if !defined(__ARM_EABI__) && !defined(__mips__) + const google_breakpad::fpstate_t* const float_state_; // ditto + #endif diff --git a/external/bzip2/ExternalProject_bzip2.mk b/external/bzip2/ExternalProject_bzip2.mk new file mode 100644 index 000000000..8b37bcd27 --- /dev/null +++ b/external/bzip2/ExternalProject_bzip2.mk @@ -0,0 +1,34 @@ +# -*- 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,bzip2)) + +$(eval $(call gb_ExternalProject_register_targets,bzip2,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_nmake,bzip2,build)) + +ifeq ($(COM),MSC) +$(call gb_ExternalProject_get_state_target,bzip2,build): + $(call gb_Trace_StartRange,bzip2,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + nmake -nologo -f makefile.msc \ + ) + $(call gb_Trace_EndRange,bzip2,EXTERNAL) +else +$(call gb_ExternalProject_get_state_target,bzip2,build): + $(call gb_Trace_StartRange,bzip2,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(MAKE) \ + ) + $(call gb_Trace_EndRange,bzip2,EXTERNAL) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/bzip2/Makefile b/external/bzip2/Makefile new file mode 100644 index 000000000..569ad8a0b --- /dev/null +++ b/external/bzip2/Makefile @@ -0,0 +1,14 @@ +# -*- 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/. +# + +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/bzip2/Module_bzip2.mk b/external/bzip2/Module_bzip2.mk new file mode 100644 index 000000000..2a59f7a6a --- /dev/null +++ b/external/bzip2/Module_bzip2.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,bzip2)) + +$(eval $(call gb_Module_add_targets,bzip2,\ + ExternalProject_bzip2 \ + UnpackedTarball_bzip2 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/bzip2/README b/external/bzip2/README new file mode 100644 index 000000000..917a9d662 --- /dev/null +++ b/external/bzip2/README @@ -0,0 +1 @@ +Data compression library from [http://bzip.org/]. diff --git a/external/bzip2/UnpackedTarball_bzip2.mk b/external/bzip2/UnpackedTarball_bzip2.mk new file mode 100644 index 000000000..f22ca2b5c --- /dev/null +++ b/external/bzip2/UnpackedTarball_bzip2.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,bzip2)) + +$(eval $(call gb_UnpackedTarball_set_tarball,bzip2,$(BZIP2_TARBALL))) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,bzip2,\ + blocksort.c \ + bzlib.c \ + compress.c \ + crctable.c \ + decompress.c \ + huffman.c \ + randtable.c \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk new file mode 100644 index 000000000..3b78a52fe --- /dev/null +++ b/external/cairo/ExternalPackage_cairo.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,cairo,cairo)) + +$(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) +ifneq ($(OS),ANDROID) + +$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.1160$(CAIRO_VERSION_MICRO).0)) + +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalPackage_pixman.mk b/external/cairo/ExternalPackage_pixman.mk new file mode 100644 index 000000000..288a9701a --- /dev/null +++ b/external/cairo/ExternalPackage_pixman.mk @@ -0,0 +1,23 @@ +# -*- 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_ExternalPackage_ExternalPackage,pixman,pixman)) + +$(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) +ifneq ($(OS),ANDROID) + +$(eval $(call gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.34.0)) + +endif +endif + + +# vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk new file mode 100644 index 000000000..43b4a7b53 --- /dev/null +++ b/external/cairo/ExternalProject_cairo.mk @@ -0,0 +1,79 @@ +# -*- 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,cairo)) + +$(eval $(call gb_ExternalProject_use_external_project,cairo,pixman)) + +$(eval $(call gb_ExternalProject_use_externals,cairo,\ + freetype \ + libpng \ + zlib \ +)) + +ifeq ($(OS),ANDROID) +$(eval $(call gb_ExternalProject_use_unpacked,cairo,fontconfig)) +$(eval $(call gb_ExternalProject_use_unpacked,cairo,libpng)) +endif + +$(eval $(call gb_ExternalProject_register_targets,cairo,\ + build \ +)) + +ifeq ($(OS),WNT) + +$(call gb_ExternalProject_get_state_target,cairo,build) : + $(call gb_Trace_StartRange,cairo,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(MAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=zlib.lib \ + ) + $(call gb_Trace_EndRange,cairo,EXTERNAL) + + +else + +# overwrite src/cairo-version.h because that is just a dummy file and included +# from cairo.h in non-overridable way + +$(call gb_ExternalProject_get_state_target,cairo,build) : + $(call gb_Trace_StartRange,cairo,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure \ + $(if $(debug),STRIP=" ") \ + $(if $(filter ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)") \ + $(if $(filter-out ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" ) \ + $(if $(filter ANDROID iOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ + LIBS="$(ZLIB_LIBS)" \ + $(if $(filter -fsanitize=%,$(LDFLAGS)),LDFLAGS="$(LDFLAGS) -fuse-ld=bfd") \ + pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \ + pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \ + $(if $(filter LINUX,$(OS)),-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\\\$$\$$ORIGIN)" \ + png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \ + png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ + $(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \ + $(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \ + $(if $(filter ANDROID iOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(DISABLE_GUI)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \ + $(if $(filter iOS,$(OS)),--enable-quartz --enable-quartz-font) \ + --disable-valgrind \ + $(if $(filter iOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \ + --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no ax_cv_c_float_words_bigendian=no)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && cp cairo-version.h src/cairo-version.h \ + && cd src && $(MAKE) \ + ) + $(call gb_Trace_EndRange,cairo,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk new file mode 100644 index 000000000..fec943762 --- /dev/null +++ b/external/cairo/ExternalProject_pixman.mk @@ -0,0 +1,48 @@ +# -*- 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,pixman)) + +$(eval $(call gb_ExternalProject_register_targets,pixman,\ + build \ +)) + +ifeq ($(OS),WNT) + +$(call gb_ExternalProject_get_state_target,pixman,build) : + $(call gb_Trace_StartRange,pixman,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(MAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release \ + ,pixman) + $(call gb_Trace_EndRange,pixman,EXTERNAL) + +else + +# ANDROID: +# The pixman-cpu.c code wants to read /proc/<pid>/auxv, but +# the Android headers don't define Elf32_auxv_t. +# +# Maybe we should instead just patch the arm_has_* booleans in +# pixman-cpu.c to be hardcoded as TRUE and patch out the run-time +# check? +$(call gb_ExternalProject_get_state_target,pixman,build) : + $(call gb_Trace_StartRange,pixman,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \ + $(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,pixman,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/cairo/Makefile b/external/cairo/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/cairo/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/cairo/Module_cairo.mk b/external/cairo/Module_cairo.mk new file mode 100644 index 000000000..6d8a29add --- /dev/null +++ b/external/cairo/Module_cairo.mk @@ -0,0 +1,21 @@ +# -*- 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,cairo)) + +$(eval $(call gb_Module_add_targets,cairo,\ + ExternalPackage_cairo \ + ExternalPackage_pixman \ + ExternalProject_cairo \ + ExternalProject_pixman \ + UnpackedTarball_cairo \ + UnpackedTarball_pixman \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/cairo/README b/external/cairo/README new file mode 100644 index 000000000..3d955dcd0 --- /dev/null +++ b/external/cairo/README @@ -0,0 +1,6 @@ +The graphics library, used for anti-aliasing. From [http://cairographics.org/]. + +This code is used by default only on Linux, though it is also +available on Mac. There is a cairo-canvas implementation that is the +main customer, and it is enabled via 'use hardware acceleration' in +the general options. diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk new file mode 100644 index 000000000..8e45e9c28 --- /dev/null +++ b/external/cairo/UnpackedTarball_cairo.mk @@ -0,0 +1,37 @@ +# -*- 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,cairo)) + +$(eval $(call gb_UnpackedTarball_set_tarball,cairo,$(CAIRO_TARBALL),,cairo)) + +$(eval $(call gb_UnpackedTarball_add_patches,cairo,\ + external/cairo/cairo/cairo-1.10.2.patch \ + external/cairo/cairo/cairo-libtool-rpath.patch.1 \ +)) + +ifeq ($(OS),iOS) +$(eval $(call gb_UnpackedTarball_add_patches,cairo,\ + external/cairo/cairo/cairo-1.10.2.no-atsui.patch \ + external/cairo/cairo/cairo-1.10.2.ios.patch \ +)) +endif + +# To be applied only when ENABLE_ANDROID_LOK is not defined +ifeq ($(OS)$(ENABLE_ANDROID_LOK),ANDROID) +$(eval $(call gb_UnpackedTarball_add_patches,cairo,\ + external/cairo/cairo/cairo.GL_RGBA.patch \ +)) +endif + +ifneq (,$(filter ANDROID iOS,$(OS))) +$(eval $(call gb_UnpackedTarball_add_file,cairo,.,external/cairo/cairo/dummy_pkg_config)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/cairo/UnpackedTarball_pixman.mk b/external/cairo/UnpackedTarball_pixman.mk new file mode 100644 index 000000000..cc3dbd11d --- /dev/null +++ b/external/cairo/UnpackedTarball_pixman.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,pixman)) + +$(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo)) + +$(eval $(call gb_UnpackedTarball_add_patches,pixman,\ + external/cairo/pixman/pixman-0.24.4.patch \ + external/cairo/pixman/pixman-ofz4372.patch \ + external/cairo/pixman/pixman-ubsan.patch \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_file,pixman,pixman,external/cairo/pixman/Makefile.win32.common)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/cairo/cairo/cairo-1.10.2.ios.patch b/external/cairo/cairo/cairo-1.10.2.ios.patch new file mode 100644 index 000000000..c61faf333 --- /dev/null +++ b/external/cairo/cairo/cairo-1.10.2.ios.patch @@ -0,0 +1,27 @@ +--- misc/cairo-1.10.2/configure 2011-12-16 10:02:39.626077757 +0100 ++++ misc/build/cairo-1.10.2/configure 2011-12-16 10:02:23.518237109 +0100 +@@ -22766,11 +22766,13 @@ + + + ac_fn_c_check_header_mongrel "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" ++if false; then + if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = x""yes; then : + + else + use_quartz="no (requires ApplicationServices framework)" + fi ++fi + + + if test "x$use_quartz" != "xyes" ; then +--- misc/cairo-1.10.2/src/cairo-quartz.h 2011-12-16 10:02:39.639079241 +0100 ++++ misc/build/cairo-1.10.2/src/cairo-quartz.h 2011-12-16 10:01:18.404789245 +0100 +@@ -40,7 +40,7 @@ + + #if CAIRO_HAS_QUARTZ_SURFACE + +-#include <ApplicationServices/ApplicationServices.h> ++#include <CoreGraphics/CoreGraphics.h> + + CAIRO_BEGIN_DECLS + diff --git a/external/cairo/cairo/cairo-1.10.2.no-atsui.patch b/external/cairo/cairo/cairo-1.10.2.no-atsui.patch new file mode 100644 index 000000000..51b98afa5 --- /dev/null +++ b/external/cairo/cairo/cairo-1.10.2.no-atsui.patch @@ -0,0 +1,22 @@ +--- misc/cairo-1.10.2/src/cairo-quartz-font.c 2010-12-25 15:21:34.000000000 +0100 ++++ misc/build/cairo-1.10.2/src/cairo-quartz-font.c 2011-12-16 09:54:18.672445207 +0100 +@@ -777,7 +777,7 @@ + return ffont->cgFont; + } + +-#ifndef __LP64__ ++#if 0 + /* + * compat with old ATSUI backend + */ +--- misc/cairo-1.10.2/src/cairo-quartz.h 2010-06-18 13:47:13.000000000 +0200 ++++ misc/build/cairo-1.10.2/src/cairo-quartz.h 2011-12-16 09:52:53.081501547 +0100 +@@ -66,7 +66,7 @@ + cairo_public cairo_font_face_t * + cairo_quartz_font_face_create_for_cgfont (CGFontRef font); + +-#ifndef __LP64__ ++#if 0 + cairo_public cairo_font_face_t * + cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id); + #endif diff --git a/external/cairo/cairo/cairo-1.10.2.patch b/external/cairo/cairo/cairo-1.10.2.patch new file mode 100644 index 000000000..f50501926 --- /dev/null +++ b/external/cairo/cairo/cairo-1.10.2.patch @@ -0,0 +1,226 @@ +diff -ruNw misc/cairo-1.10.2/build/Makefile.win32.features misc/build/cairo-1.10.2/build/Makefile.win32.features +--- misc/cairo-1.10.2/build/Makefile.win32.features 2015-10-27 17:04:21.000000000 -0400 ++++ misc/build/cairo-1.10.2/build/Makefile.win32.features 2017-11-24 21:43:14.103524768 -0500 +@@ -30,7 +30,7 @@ + CAIRO_HAS_FC_FONT=0 + CAIRO_HAS_PS_SURFACE=1 + CAIRO_HAS_PDF_SURFACE=1 +-CAIRO_HAS_SVG_SURFACE=1 ++CAIRO_HAS_SVG_SURFACE=0 + CAIRO_HAS_TEST_SURFACES=0 + CAIRO_HAS_TEE_SURFACE=0 + CAIRO_HAS_XML_SURFACE=0 +diff -ruNw misc/cairo-1.10.2/configure misc/build/cairo-1.10.2/configure +--- misc/cairo-1.10.2/configure 2015-12-09 15:41:45.000000000 -0500 ++++ misc/build/cairo-1.10.2/configure 2017-11-24 21:43:14.103524768 -0500 +@@ -20580,61 +20580,12 @@ + rm -f confcache + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 +-$as_echo_n "checking for compress in -lz... " >&6; } +-if ${ac_cv_lib_z_compress+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char compress (); +-int +-main () +-{ +-return compress (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_z_compress=yes +-else +- ac_cv_lib_z_compress=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 +-$as_echo "$ac_cv_lib_z_compress" >&6; } +-if test "x$ac_cv_lib_z_compress" = xyes; then : +- ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +-if test "x$ac_cv_header_zlib_h" = xyes; then : + + have_libz=yes + + $as_echo "#define HAVE_ZLIB 1" >>confdefs.h + + +-else +- have_libz="no (requires zlib http://www.gzip.org/zlib/)" +-fi +- +- +-else +- have_libz="no (requires zlib http://www.gzip.org/zlib/)" +-fi +- +- + save_LIBS="$LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo2a_decompress in -llzo2" >&5 + $as_echo_n "checking for lzo2a_decompress in -llzo2... " >&6; } +@@ -30069,7 +30020,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - OK" >&5 + $as_echo "$FREETYPE_VERSION - OK" >&6; } + ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags` +- ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs` ++ ft_NONPKGCONFIG_LIBS=`$FREETYPE_CONFIG --libs | $SED -e 's/-lz//g'` + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - Too old" >&5 + $as_echo "$FREETYPE_VERSION - Too old" >&6; } + use_ft="no ($FREETYPE_VERSION found; version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)" +@@ -30079,7 +30030,7 @@ + fi + + ft_CFLAGS="$FREETYPE_CFLAGS" +- ft_LIBS="$FREETYPE_LIBS" ++ ft_LIBS=`echo "$FREETYPE_LIBS" | $SED -e 's/-lz//g'` + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's FreeType font backend feature could be enabled" >&5 +@@ -30686,7 +30637,7 @@ + + # The ps backend requires zlib. + use_ps=$have_libz +- ps_NONPKGCONFIG_LIBS=-lz ++ ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PostScript surface backend feature could be enabled" >&5 +@@ -31082,7 +31033,7 @@ + + # The pdf backend requires zlib. + use_pdf=$have_libz +- pdf_NONPKGCONFIG_LIBS=-lz ++ pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PDF surface backend feature could be enabled" >&5 +@@ -32973,7 +32924,7 @@ + + + use_xml=$have_libz +- xml_NONPKGCONFIG_LIBS=-lz ++ xml_NONPKGCONFIG_LIBS=$ZLIB3RDLIB + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's xml surface backend feature could be enabled" >&5 +diff -ruNw misc/cairo-1.10.2/src/cairo.h misc/build/cairo-1.10.2/src/cairo.h +--- misc/cairo-1.10.2/src/cairo.h 2015-10-27 17:04:21.000000000 -0400 ++++ misc/build/cairo-1.10.2/src/cairo.h 2017-12-17 12:09:59.880406411 -0500 +@@ -397,6 +397,8 @@ + * with red in the upper 5 bits, then green in the middle + * 6 bits, and blue in the lower 5 bits. (Since 1.2) + * @CAIRO_FORMAT_RGB30: like RGB24 but with 10bpc. (Since 1.12) ++ * @CAIRO_FORMAT_RGB24_888: each pixel is a 24-bit quantity, ++ * with Red, Green, Blue taking 8-bits each, in that order. (Since 1.1x) + * + * #cairo_format_t is used to identify the memory format of + * image data. +@@ -412,9 +414,16 @@ + CAIRO_FORMAT_A8 = 2, + CAIRO_FORMAT_A1 = 3, + CAIRO_FORMAT_RGB16_565 = 4, +- CAIRO_FORMAT_RGB30 = 5 ++ CAIRO_FORMAT_RGB30 = 5, ++ CAIRO_FORMAT_RGB24_888 = 6 + } cairo_format_t; + ++/** ++ * Need this until CAIRO_FORMAT_RGB24_888 is in some official release. ++ * Otherwise we can't reliably check if this is available or we should ++ * convert from 24-bit RGB to 32-bit RGB before passing to Cairo. ++ **/ ++#define HAVE_CAIRO_FORMAT_RGB24_888 + + /** + * cairo_write_func_t: +diff -ruNw misc/cairo-1.10.2/src/cairo-image-source.c misc/build/cairo-1.10.2/src/cairo-image-source.c +--- misc/cairo-1.10.2/src/cairo-image-source.c 2015-10-27 17:04:30.000000000 -0400 ++++ misc/build/cairo-1.10.2/src/cairo-image-source.c 2017-12-17 12:09:56.076344387 -0500 +@@ -508,6 +508,19 @@ + color.blue = expand_channel(pixel & 0x3fff, 10); + return pixman_image_create_solid_fill (&color); + ++ case CAIRO_FORMAT_RGB24_888: ++ pixel = *(uint32_t *) (image->data + y * image->stride + 3 * x); ++ pixel &= 0x00ffffff; /* ignore next pixel bits */ ++ if (pixel == 0) ++ return _pixman_black_image (); ++ if (pixel == 0x00ffffff) ++ return _pixman_white_image (); ++ ++ color.red = (pixel >> 16 & 0xff) | (pixel >> 8 & 0xff00); ++ color.green = (pixel >> 8 & 0xff) | (pixel & 0xff00); ++ color.blue = (pixel & 0xff) | (pixel << 8 & 0xff00); ++ return pixman_image_create_solid_fill (&color); ++ + case CAIRO_FORMAT_ARGB32: + case CAIRO_FORMAT_RGB24: + pixel = *(uint32_t *) (image->data + y * image->stride + 4 * x); +diff -ruNw misc/cairo-1.10.2/src/cairo-image-surface.c misc/build/cairo-1.10.2/src/cairo-image-surface.c +--- misc/cairo-1.10.2/src/cairo-image-surface.c 2015-10-27 17:04:30.000000000 -0400 ++++ misc/build/cairo-1.10.2/src/cairo-image-surface.c 2017-12-17 12:09:59.876406346 -0500 +@@ -104,13 +104,15 @@ + return CAIRO_FORMAT_A1; + case PIXMAN_r5g6b5: + return CAIRO_FORMAT_RGB16_565; ++ case PIXMAN_r8g8b8: ++ return CAIRO_FORMAT_RGB24_888; + #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,22,0) + case PIXMAN_r8g8b8a8: case PIXMAN_r8g8b8x8: + #endif + #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,27,2) + case PIXMAN_a8r8g8b8_sRGB: + #endif +- case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: case PIXMAN_r8g8b8: ++ case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: + case PIXMAN_b8g8r8: case PIXMAN_b5g6r5: + case PIXMAN_a1r5g5b5: case PIXMAN_x1r5g5b5: case PIXMAN_a1b5g5r5: + case PIXMAN_x1b5g5r5: case PIXMAN_a4r4g4b4: case PIXMAN_x4r4g4b4: +@@ -320,6 +322,9 @@ + case CAIRO_FORMAT_RGB16_565: + ret = PIXMAN_r5g6b5; + break; ++ case CAIRO_FORMAT_RGB24_888: ++ ret = PIXMAN_r8g8b8; ++ break; + case CAIRO_FORMAT_ARGB32: + case CAIRO_FORMAT_INVALID: + default: +@@ -718,6 +723,8 @@ + case CAIRO_FORMAT_RGB30: + case CAIRO_FORMAT_RGB24: + return 32; ++ case CAIRO_FORMAT_RGB24_888: ++ return 24; + case CAIRO_FORMAT_RGB16_565: + return 16; + case CAIRO_FORMAT_A8: +diff -ruNw misc/cairo-1.10.2/src/cairoint.h misc/build/cairo-1.10.2/src/cairoint.h +--- misc/cairo-1.10.2/src/cairoint.h 2015-10-27 17:04:30.000000000 -0400 ++++ misc/build/cairo-1.10.2/src/cairoint.h 2017-12-17 12:09:59.880406411 -0500 +@@ -1486,7 +1486,7 @@ + * in cairo-xlib-surface.c--again see -Wswitch-enum). + */ + #define CAIRO_FORMAT_VALID(format) ((format) >= CAIRO_FORMAT_ARGB32 && \ +- (format) <= CAIRO_FORMAT_RGB30) ++ (format) <= CAIRO_FORMAT_RGB24_888) + + /* pixman-required stride alignment in bytes. */ + #define CAIRO_STRIDE_ALIGNMENT (sizeof (uint32_t)) diff --git a/external/cairo/cairo/cairo-libtool-rpath.patch.1 b/external/cairo/cairo/cairo-libtool-rpath.patch.1 new file mode 100644 index 000000000..dffa25414 --- /dev/null +++ b/external/cairo/cairo/cairo-libtool-rpath.patch.1 @@ -0,0 +1,12 @@ +Prevent libtool from adding annoying stuff to RPATH + +--- cairo/configure.orig 2018-10-19 22:20:08.000000000 +0200 ++++ cairo/configure 2019-09-04 17:53:00.927539686 +0200 +@@ -16592,6 +16592,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec= + ;; + + lynxos*) diff --git a/external/cairo/cairo/cairo.GL_RGBA.patch b/external/cairo/cairo/cairo.GL_RGBA.patch new file mode 100644 index 000000000..5f50dd13f --- /dev/null +++ b/external/cairo/cairo/cairo.GL_RGBA.patch @@ -0,0 +1,49 @@ +--- misc/cairo-1.10.2/src/cairo-image-surface.c ++++ misc/cairo-1.10.2/src/cairo-image-surface.c +@@ -92,11 +92,11 @@ + _cairo_format_from_pixman_format (pixman_format_code_t pixman_format) + { + switch (pixman_format) { +- case PIXMAN_a8r8g8b8: ++ case PIXMAN_a8b8g8r8: //tweaked + return CAIRO_FORMAT_ARGB32; + case PIXMAN_x2r10g10b10: + return CAIRO_FORMAT_RGB30; +- case PIXMAN_x8r8g8b8: ++ case PIXMAN_x8b8g8r8: //tweaked + return CAIRO_FORMAT_RGB24; + case PIXMAN_a8: + return CAIRO_FORMAT_A8; +@@ -112,7 +112,7 @@ + #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,27,2) + case PIXMAN_a8r8g8b8_sRGB: + #endif +- case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: ++ case PIXMAN_a8r8g8b8: case PIXMAN_x8r8g8b8: //tweaked + case PIXMAN_b8g8r8: case PIXMAN_b5g6r5: + case PIXMAN_a1r5g5b5: case PIXMAN_x1r5g5b5: case PIXMAN_a1b5g5r5: + case PIXMAN_x1b5g5r5: case PIXMAN_a4r4g4b4: case PIXMAN_x4r4g4b4: +@@ -314,7 +314,7 @@ + ret = PIXMAN_a8; + break; + case CAIRO_FORMAT_RGB24: +- ret = PIXMAN_x8r8g8b8; ++ ret = PIXMAN_x8b8g8r8; //tweaked + break; + case CAIRO_FORMAT_RGB30: + ret = PIXMAN_x2r10g10b10; +@@ -323,12 +323,12 @@ + ret = PIXMAN_r5g6b5; + break; + case CAIRO_FORMAT_RGB24_888: +- ret = PIXMAN_r8g8b8; ++ ret = PIXMAN_b8g8r8; // tweaked + break; + case CAIRO_FORMAT_ARGB32: + case CAIRO_FORMAT_INVALID: + default: +- ret = PIXMAN_a8r8g8b8; ++ ret = PIXMAN_a8b8g8r8; //tweaked + break; + } + return ret; diff --git a/external/cairo/cairo/dummy_pkg_config b/external/cairo/cairo/dummy_pkg_config new file mode 100755 index 000000000..829303ea5 --- /dev/null +++ b/external/cairo/cairo/dummy_pkg_config @@ -0,0 +1,3 @@ +#!/bin/sh + + diff --git a/external/cairo/pixman/Makefile.win32.common b/external/cairo/pixman/Makefile.win32.common new file mode 100644 index 000000000..30b94e7b1 --- /dev/null +++ b/external/cairo/pixman/Makefile.win32.common @@ -0,0 +1,54 @@ +LIBRARY = pixman-1 + +CC = cl +LD = link +AR = lib +PERL = perl + +ifeq ($(top_builddir),) +top_builddir = $(top_srcdir) +endif + +CFG_VAR = $(CFG) +ifeq ($(CFG_VAR),) +CFG_VAR = release +endif + +ifeq ($(CFG_VAR),debug) +CFG_CFLAGS = -MD -Od -Zi +CFG_LDFLAGS = -DEBUG +else +CFG_CFLAGS = -MD -O2 +CFG_LDFLAGS = +endif + +# Package definitions, to be used instead of those provided in config.h +PKG_CFLAGS = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT="" + +BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman + +PIXMAN_CFLAGS = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS) +PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS) +PIXMAN_ARFLAGS = -nologo $(LDFLAGS) + + +inform: +ifneq ($(CFG),release) +ifneq ($(CFG),debug) +ifneq ($(CFG),) + @echo "Invalid specified configuration option: "$(CFG)"." + @echo + @echo "Possible choices for configuration are 'release' and 'debug'" + @exit 1 +endif + @echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)" +endif +endif + + +$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES) + @mkdir -p $(CFG_VAR) + @$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $< + +clean: inform + @$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0 diff --git a/external/cairo/pixman/pixman-0.24.4.patch b/external/cairo/pixman/pixman-0.24.4.patch new file mode 100644 index 000000000..6d871e37b --- /dev/null +++ b/external/cairo/pixman/pixman-0.24.4.patch @@ -0,0 +1,91 @@ +--- misc/pixman-0.24.4/Makefile.in 2011-11-06 22:11:25.000000000 +0100 ++++ misc/build/pixman-0.24.4/Makefile.in 2011-12-16 09:06:45.317211035 +0100 +@@ -272,7 +272,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = pixman demos test ++SUBDIRS = pixman + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = pixman-1.pc + GPGKEY = 3892336E +--- misc/pixman-0.24.4/pixman/pixman-utils.c ++++ misc/build/pixman-0.24.4/pixman/pixman-utils.c +@@ -27,6 +27,7 @@ + #endif + #include <stdio.h> + #include <stdlib.h> ++#include <limits.h> + + #include "pixman-private.h" + +--- misc/pixman-0.24.4/pixman/pixman-glyph.c 2015-06-30 05:48:31.000000000 -0400 ++++ misc/build/pixman-0.24.4/pixman/pixman-glyph.c 2017-11-25 13:26:33.075558418 -0500 +@@ -38,6 +38,7 @@ + + /* XXX: These numbers are arbitrary---we've never done any measurements. + */ ++#define N_PIXELS_HIGH_WATER (4 * 1024 * 1024) + #define N_GLYPHS_HIGH_WATER (16384) + #define N_GLYPHS_LOW_WATER (8192) + #define HASH_SIZE (2 * N_GLYPHS_HIGH_WATER) +@@ -58,6 +59,7 @@ + int n_glyphs; + int n_tombstones; + int freeze_count; ++ long n_pixels; + pixman_list_t mru; + glyph_t * glyphs[HASH_SIZE]; + }; +@@ -133,6 +135,7 @@ + if (*loc == TOMBSTONE) + cache->n_tombstones--; + cache->n_glyphs++; ++ cache->n_pixels += glyph->image->bits.width * glyph->image->bits.height; + + *loc = glyph; + } +@@ -150,6 +153,7 @@ + cache->glyphs[idx & HASH_MASK] = TOMBSTONE; + cache->n_tombstones++; + cache->n_glyphs--; ++ cache->n_pixels -= glyph->image->bits.width * glyph->image->bits.height; + + /* Eliminate tombstones if possible */ + if (cache->glyphs[(idx + 1) & HASH_MASK] == NULL) +@@ -180,6 +184,7 @@ + + cache->n_glyphs = 0; + cache->n_tombstones = 0; ++ cache->n_pixels = 0; + } + + PIXMAN_EXPORT pixman_glyph_cache_t * +@@ -194,6 +199,7 @@ + cache->n_glyphs = 0; + cache->n_tombstones = 0; + cache->freeze_count = 0; ++ cache->n_pixels = 0; + + pixman_list_init (&cache->mru); + +@@ -220,9 +226,9 @@ + pixman_glyph_cache_thaw (pixman_glyph_cache_t *cache) + { + if (--cache->freeze_count == 0 && +- cache->n_glyphs + cache->n_tombstones > N_GLYPHS_HIGH_WATER) ++ (cache->n_glyphs + cache->n_tombstones > N_GLYPHS_HIGH_WATER || cache->n_pixels > N_PIXELS_HIGH_WATER)) + { +- if (cache->n_tombstones > N_GLYPHS_HIGH_WATER) ++ if (cache->n_tombstones > N_GLYPHS_LOW_WATER) + { + /* More than half the entries are + * tombstones. Just dump the whole table. +@@ -230,7 +236,7 @@ + clear_table (cache); + } + +- while (cache->n_glyphs > N_GLYPHS_LOW_WATER) ++ while (cache->n_glyphs > N_GLYPHS_LOW_WATER || cache->n_pixels > N_PIXELS_HIGH_WATER) + { + glyph_t *glyph = CONTAINER_OF (glyph_t, mru_link, cache->mru.tail); diff --git a/external/cairo/pixman/pixman-ofz4372.patch b/external/cairo/pixman/pixman-ofz4372.patch new file mode 100644 index 000000000..aaf83f11d --- /dev/null +++ b/external/cairo/pixman/pixman-ofz4372.patch @@ -0,0 +1,16 @@ +--- misc/pixman/pixman/pixman-solid-fill.c ++++ misc/build/pixman/pixman/pixman-solid-fill.c +@@ -30,10 +30,10 @@ static uint32_t + color_to_uint32 (const pixman_color_t *color) + { + return +- (color->alpha >> 8 << 24) | +- (color->red >> 8 << 16) | ++ ((uint32_t)color->alpha >> 8 << 24) | ++ ((uint32_t)color->red >> 8 << 16) | + (color->green & 0xff00) | +- (color->blue >> 8); ++ ((uint32_t)color->blue >> 8); + } + + static argb_t diff --git a/external/cairo/pixman/pixman-ubsan.patch b/external/cairo/pixman/pixman-ubsan.patch new file mode 100644 index 000000000..583706ae1 --- /dev/null +++ b/external/cairo/pixman/pixman-ubsan.patch @@ -0,0 +1,33 @@ +--- misc/pixman/pixman/pixman.h ++++ misc/build/pixman/pixman/pixman.h +@@ -127,7 +127,7 @@ + #define pixman_fixed_1_minus_e (pixman_fixed_1 - pixman_fixed_e) + #define pixman_fixed_minus_1 (pixman_int_to_fixed(-1)) + #define pixman_fixed_to_int(f) ((int) ((f) >> 16)) +-#define pixman_int_to_fixed(i) ((pixman_fixed_t) ((i) << 16)) ++#define pixman_int_to_fixed(i) ((pixman_fixed_t) ((i) * (1 << 16))) + #define pixman_fixed_to_double(f) (double) ((f) / (double) pixman_fixed_1) + #define pixman_double_to_fixed(d) ((pixman_fixed_t) ((d) * 65536.0)) + #define pixman_fixed_frac(f) ((f) & pixman_fixed_1_minus_e) +--- misc/pixman/pixman/pixman-fast-path.c ++++ misc/build/pixman/pixman/pixman-fast-path.c +@@ -2836,7 +2836,7 @@ + sgtot = CLIP (sgtot, 0, 0xff); + sbtot = CLIP (sbtot, 0, 0xff); + +- buffer[k] = (satot << 24) | (srtot << 16) | (sgtot << 8) | (sbtot << 0); ++ buffer[k] = ((uint32_t)satot << 24) | (srtot << 16) | (sgtot << 8) | (sbtot << 0); + + next: + vx += ux; +--- misc/pixman/pixman/pixman-bits-image.c ++++ misc/build/pixman/pixman/pixman-bits-image.c +@@ -306,7 +306,7 @@ + sgtot = CLIP (sgtot, 0, 0xff); + sbtot = CLIP (sbtot, 0, 0xff); + +- return ((satot << 24) | (srtot << 16) | (sgtot << 8) | (sbtot)); ++ return (((uint32_t)satot << 24) | (srtot << 16) | (sgtot << 8) | (sbtot)); + } + + static force_inline uint32_t diff --git a/external/clew/Library_clew.mk b/external/clew/Library_clew.mk new file mode 100644 index 000000000..9e664fed5 --- /dev/null +++ b/external/clew/Library_clew.mk @@ -0,0 +1,41 @@ +# -*- 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_Library_Library,clew)) + +$(eval $(call gb_Library_add_defs,clew,\ + -DCLEW_BUILD \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_libs,clew,\ + -ldl \ + -lrt \ +)) +endif + +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_libs,clew,\ + -framework OpenCL \ +)) +endif + +$(eval $(call gb_Library_add_cobjects,clew,\ + external/clew/source/clew \ +)) + +$(eval $(call gb_Library_set_include,clew, \ + -I$(SRCDIR)/external/clew/source/include \ + $$(INCLUDE) \ +)) + +# This is required for module-deps.pl to produce correct dependencies. +$(eval $(call gb_Library_use_libraries,clew,)) + +# vim: set noet sw=4 ts=4: diff --git a/external/clew/Makefile b/external/clew/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/clew/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/clew/Module_clew.mk b/external/clew/Module_clew.mk new file mode 100644 index 000000000..51f174b78 --- /dev/null +++ b/external/clew/Module_clew.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/. +# + +$(eval $(call gb_Module_Module,clew)) + +$(eval $(call gb_Module_add_targets,clew,\ + Library_clew \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/clew/README b/external/clew/README new file mode 100644 index 000000000..7a0d65293 --- /dev/null +++ b/external/clew/README @@ -0,0 +1,5 @@ +CLEW is the OpenCL Extension Wrangler - similar to GLEW but for OpenCL + +This project doesn't appear to have an obvious upstream, so +the source files are in our git repo and there is no option +to use a system library. diff --git a/external/clew/source/clew.c b/external/clew/source/clew.c new file mode 100644 index 000000000..4ed80035d --- /dev/null +++ b/external/clew/source/clew.c @@ -0,0 +1,325 @@ +////////////////////////////////////////////////////////////////////////// +// Copyright (c) 2009-2011 Organic Vectory B.V. +// Written by George van Venrooij +// +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file license.txt) +////////////////////////////////////////////////////////////////////////// + +#include "clew/clew.h" + +//! \file clew.c +//! \brief OpenCL run-time loader source + +#ifndef CLCC_GENERATE_DOCUMENTATION + #ifdef _WIN32 + #define WIN32_LEAN_AND_MEAN + #include <windows.h> + + typedef HMODULE CLCC_DYNLIB_HANDLE; + + #define CLCC_DYNLIB_OPEN LoadLibrary + #define CLCC_DYNLIB_CLOSE FreeLibrary + #define CLCC_DYNLIB_IMPORT GetProcAddress + #else + #include <dlfcn.h> + + typedef void* CLCC_DYNLIB_HANDLE; + + #define CLCC_DYNLIB_OPEN(path) dlopen(path, RTLD_NOW | RTLD_GLOBAL) + #define CLCC_DYNLIB_CLOSE dlclose + #define CLCC_DYNLIB_IMPORT dlsym + #endif +#else + //typedef implementation_defined CLCC_DYNLIB_HANDLE; + //#define CLCC_DYNLIB_OPEN(path) implementation_defined + //#define CLCC_DYNLIB_CLOSE implementation_defined + //#define CLCC_DYNLIB_IMPORT implementation_defined +#endif + +#include <stdlib.h> + +//! \brief module handle +static CLCC_DYNLIB_HANDLE module = NULL; + +// Variables holding function entry points +#ifndef CLCC_GENERATE_DOCUMENTATION +PFNCLGETPLATFORMIDS __clewGetPlatformIDs = NULL; +PFNCLGETPLATFORMINFO __clewGetPlatformInfo = NULL; +PFNCLGETDEVICEIDS __clewGetDeviceIDs = NULL; +PFNCLGETDEVICEINFO __clewGetDeviceInfo = NULL; +PFNCLCREATECONTEXT __clewCreateContext = NULL; +PFNCLCREATECONTEXTFROMTYPE __clewCreateContextFromType = NULL; +PFNCLRETAINCONTEXT __clewRetainContext = NULL; +PFNCLRELEASECONTEXT __clewReleaseContext = NULL; +PFNCLGETCONTEXTINFO __clewGetContextInfo = NULL; +PFNCLCREATECOMMANDQUEUE __clewCreateCommandQueue = NULL; +PFNCLRETAINCOMMANDQUEUE __clewRetainCommandQueue = NULL; +PFNCLRELEASECOMMANDQUEUE __clewReleaseCommandQueue = NULL; +PFNCLGETCOMMANDQUEUEINFO __clewGetCommandQueueInfo = NULL; +PFNCLSETCOMMANDQUEUEPROPERTY __clewSetCommandQueueProperty = NULL; +PFNCLCREATEBUFFER __clewCreateBuffer = NULL; +PFNCLCREATEIMAGE2D __clewCreateImage2D = NULL; +PFNCLCREATEIMAGE3D __clewCreateImage3D = NULL; +PFNCLRETAINMEMOBJECT __clewRetainMemObject = NULL; +PFNCLRELEASEMEMOBJECT __clewReleaseMemObject = NULL; +PFNCLGETSUPPORTEDIMAGEFORMATS __clewGetSupportedImageFormats = NULL; +PFNCLGETMEMOBJECTINFO __clewGetMemObjectInfo = NULL; +PFNCLGETIMAGEINFO __clewGetImageInfo = NULL; +PFNCLCREATESAMPLER __clewCreateSampler = NULL; +PFNCLRETAINSAMPLER __clewRetainSampler = NULL; +PFNCLRELEASESAMPLER __clewReleaseSampler = NULL; +PFNCLGETSAMPLERINFO __clewGetSamplerInfo = NULL; +PFNCLCREATEPROGRAMWITHSOURCE __clewCreateProgramWithSource = NULL; +PFNCLCREATEPROGRAMWITHBINARY __clewCreateProgramWithBinary = NULL; +PFNCLRETAINPROGRAM __clewRetainProgram = NULL; +PFNCLRELEASEPROGRAM __clewReleaseProgram = NULL; +PFNCLBUILDPROGRAM __clewBuildProgram = NULL; +PFNCLUNLOADCOMPILER __clewUnloadCompiler = NULL; +PFNCLGETPROGRAMINFO __clewGetProgramInfo = NULL; +PFNCLGETPROGRAMBUILDINFO __clewGetProgramBuildInfo = NULL; +PFNCLCREATEKERNEL __clewCreateKernel = NULL; +PFNCLCREATEKERNELSINPROGRAM __clewCreateKernelsInProgram = NULL; +PFNCLRETAINKERNEL __clewRetainKernel = NULL; +PFNCLRELEASEKERNEL __clewReleaseKernel = NULL; +PFNCLSETKERNELARG __clewSetKernelArg = NULL; +PFNCLGETKERNELINFO __clewGetKernelInfo = NULL; +PFNCLGETKERNELWORKGROUPINFO __clewGetKernelWorkGroupInfo = NULL; +PFNCLWAITFOREVENTS __clewWaitForEvents = NULL; +PFNCLGETEVENTINFO __clewGetEventInfo = NULL; +PFNCLRETAINEVENT __clewRetainEvent = NULL; +PFNCLRELEASEEVENT __clewReleaseEvent = NULL; +PFNCLGETEVENTPROFILINGINFO __clewGetEventProfilingInfo = NULL; +PFNCLFLUSH __clewFlush = NULL; +PFNCLFINISH __clewFinish = NULL; +PFNCLENQUEUEREADBUFFER __clewEnqueueReadBuffer = NULL; +PFNCLENQUEUEWRITEBUFFER __clewEnqueueWriteBuffer = NULL; +PFNCLENQUEUECOPYBUFFER __clewEnqueueCopyBuffer = NULL; +PFNCLENQUEUEREADIMAGE __clewEnqueueReadImage = NULL; +PFNCLENQUEUEWRITEIMAGE __clewEnqueueWriteImage = NULL; +PFNCLENQUEUECOPYIMAGE __clewEnqueueCopyImage = NULL; +PFNCLENQUEUECOPYIMAGETOBUFFER __clewEnqueueCopyImageToBuffer = NULL; +PFNCLENQUEUECOPYBUFFERTOIMAGE __clewEnqueueCopyBufferToImage = NULL; +PFNCLENQUEUEMAPBUFFER __clewEnqueueMapBuffer = NULL; +PFNCLENQUEUEMAPIMAGE __clewEnqueueMapImage = NULL; +PFNCLENQUEUEUNMAPMEMOBJECT __clewEnqueueUnmapMemObject = NULL; +PFNCLENQUEUENDRANGEKERNEL __clewEnqueueNDRangeKernel = NULL; +PFNCLENQUEUETASK __clewEnqueueTask = NULL; +PFNCLENQUEUENATIVEKERNEL __clewEnqueueNativeKernel = NULL; +PFNCLENQUEUEMARKER __clewEnqueueMarker = NULL; +PFNCLENQUEUEWAITFOREVENTS __clewEnqueueWaitForEvents = NULL; +PFNCLENQUEUEBARRIER __clewEnqueueBarrier = NULL; +PFNCLGETEXTENSIONFUNCTIONADDRESS __clewGetExtensionFunctionAddress = NULL; +#endif // CLCC_GENERATE_DOCUMENTATION + + +//! \brief Unloads OpenCL dynamic library, should not be called directly +static void clewExit(void) +{ + if (module != NULL) + { + // Ignore errors + CLCC_DYNLIB_CLOSE(module); + module = NULL; + } +} + +#define CLEW_CHECK_FUNCTION(f) \ + if ((f) == NULL) \ + { \ + CLCC_DYNLIB_CLOSE(module); \ + module = NULL; \ + return CLEW_ERROR_IMPORT_FAILED; \ + } \ + +//! \param path path to dynamic library to load +//! \return CLEW_ERROR_OPEN_FAILED if the library could not be opened +//! CLEW_ERROR_ATEXIT_FAILED if atexit(clewExit) failed +//! CLEW_SUCCESS when the library was successfully loaded +int clewInit(const char* path) +{ + int error = 0; + + // Check if already initialized + if (module != NULL) + { + return CLEW_SUCCESS; + } + + // Load library + module = CLCC_DYNLIB_OPEN(path); + + // Check for errors + if (module == NULL) + { + return CLEW_ERROR_OPEN_FAILED; + } + + // Set unloading + error = atexit(clewExit); + + if (error) + { + // Failure queueing atexit, shutdown with error + CLCC_DYNLIB_CLOSE(module); + module = NULL; + + return CLEW_ERROR_ATEXIT_FAILED; + } + + // Determine function entry-points + CLEW_CHECK_FUNCTION(__clewGetPlatformIDs = (PFNCLGETPLATFORMIDS )CLCC_DYNLIB_IMPORT(module, "clGetPlatformIDs")); + CLEW_CHECK_FUNCTION(__clewGetPlatformInfo = (PFNCLGETPLATFORMINFO )CLCC_DYNLIB_IMPORT(module, "clGetPlatformInfo")); + CLEW_CHECK_FUNCTION(__clewGetDeviceIDs = (PFNCLGETDEVICEIDS )CLCC_DYNLIB_IMPORT(module, "clGetDeviceIDs")); + CLEW_CHECK_FUNCTION(__clewGetDeviceInfo = (PFNCLGETDEVICEINFO )CLCC_DYNLIB_IMPORT(module, "clGetDeviceInfo")); + CLEW_CHECK_FUNCTION(__clewCreateContext = (PFNCLCREATECONTEXT )CLCC_DYNLIB_IMPORT(module, "clCreateContext")); + CLEW_CHECK_FUNCTION(__clewCreateContextFromType = (PFNCLCREATECONTEXTFROMTYPE )CLCC_DYNLIB_IMPORT(module, "clCreateContextFromType")); + CLEW_CHECK_FUNCTION(__clewRetainContext = (PFNCLRETAINCONTEXT )CLCC_DYNLIB_IMPORT(module, "clRetainContext")); + CLEW_CHECK_FUNCTION(__clewReleaseContext = (PFNCLRELEASECONTEXT )CLCC_DYNLIB_IMPORT(module, "clReleaseContext")); + CLEW_CHECK_FUNCTION(__clewGetContextInfo = (PFNCLGETCONTEXTINFO )CLCC_DYNLIB_IMPORT(module, "clGetContextInfo")); + CLEW_CHECK_FUNCTION(__clewCreateCommandQueue = (PFNCLCREATECOMMANDQUEUE )CLCC_DYNLIB_IMPORT(module, "clCreateCommandQueue")); + CLEW_CHECK_FUNCTION(__clewRetainCommandQueue = (PFNCLRETAINCOMMANDQUEUE )CLCC_DYNLIB_IMPORT(module, "clRetainCommandQueue")); + CLEW_CHECK_FUNCTION(__clewReleaseCommandQueue = (PFNCLRELEASECOMMANDQUEUE )CLCC_DYNLIB_IMPORT(module, "clReleaseCommandQueue")); + CLEW_CHECK_FUNCTION(__clewGetCommandQueueInfo = (PFNCLGETCOMMANDQUEUEINFO )CLCC_DYNLIB_IMPORT(module, "clGetCommandQueueInfo")); + CLEW_CHECK_FUNCTION(__clewSetCommandQueueProperty = (PFNCLSETCOMMANDQUEUEPROPERTY )CLCC_DYNLIB_IMPORT(module, "clSetCommandQueueProperty")); + CLEW_CHECK_FUNCTION(__clewCreateBuffer = (PFNCLCREATEBUFFER )CLCC_DYNLIB_IMPORT(module, "clCreateBuffer")); + CLEW_CHECK_FUNCTION(__clewCreateImage2D = (PFNCLCREATEIMAGE2D )CLCC_DYNLIB_IMPORT(module, "clCreateImage2D")); + CLEW_CHECK_FUNCTION(__clewCreateImage3D = (PFNCLCREATEIMAGE3D )CLCC_DYNLIB_IMPORT(module, "clCreateImage3D")); + CLEW_CHECK_FUNCTION(__clewRetainMemObject = (PFNCLRETAINMEMOBJECT )CLCC_DYNLIB_IMPORT(module, "clRetainMemObject")); + CLEW_CHECK_FUNCTION(__clewReleaseMemObject = (PFNCLRELEASEMEMOBJECT )CLCC_DYNLIB_IMPORT(module, "clReleaseMemObject")); + CLEW_CHECK_FUNCTION(__clewGetSupportedImageFormats = (PFNCLGETSUPPORTEDIMAGEFORMATS )CLCC_DYNLIB_IMPORT(module, "clGetSupportedImageFormats")); + CLEW_CHECK_FUNCTION(__clewGetMemObjectInfo = (PFNCLGETMEMOBJECTINFO )CLCC_DYNLIB_IMPORT(module, "clGetMemObjectInfo")); + CLEW_CHECK_FUNCTION(__clewGetImageInfo = (PFNCLGETIMAGEINFO )CLCC_DYNLIB_IMPORT(module, "clGetImageInfo")); + CLEW_CHECK_FUNCTION(__clewCreateSampler = (PFNCLCREATESAMPLER )CLCC_DYNLIB_IMPORT(module, "clCreateSampler")); + CLEW_CHECK_FUNCTION(__clewRetainSampler = (PFNCLRETAINSAMPLER )CLCC_DYNLIB_IMPORT(module, "clRetainSampler")); + CLEW_CHECK_FUNCTION(__clewReleaseSampler = (PFNCLRELEASESAMPLER )CLCC_DYNLIB_IMPORT(module, "clReleaseSampler")); + CLEW_CHECK_FUNCTION(__clewGetSamplerInfo = (PFNCLGETSAMPLERINFO )CLCC_DYNLIB_IMPORT(module, "clGetSamplerInfo")); + CLEW_CHECK_FUNCTION(__clewCreateProgramWithSource = (PFNCLCREATEPROGRAMWITHSOURCE )CLCC_DYNLIB_IMPORT(module, "clCreateProgramWithSource")); + CLEW_CHECK_FUNCTION(__clewCreateProgramWithBinary = (PFNCLCREATEPROGRAMWITHBINARY )CLCC_DYNLIB_IMPORT(module, "clCreateProgramWithBinary")); + CLEW_CHECK_FUNCTION(__clewRetainProgram = (PFNCLRETAINPROGRAM )CLCC_DYNLIB_IMPORT(module, "clRetainProgram")); + CLEW_CHECK_FUNCTION(__clewReleaseProgram = (PFNCLRELEASEPROGRAM )CLCC_DYNLIB_IMPORT(module, "clReleaseProgram")); + CLEW_CHECK_FUNCTION(__clewBuildProgram = (PFNCLBUILDPROGRAM )CLCC_DYNLIB_IMPORT(module, "clBuildProgram")); + CLEW_CHECK_FUNCTION(__clewUnloadCompiler = (PFNCLUNLOADCOMPILER )CLCC_DYNLIB_IMPORT(module, "clUnloadCompiler")); + CLEW_CHECK_FUNCTION(__clewGetProgramInfo = (PFNCLGETPROGRAMINFO )CLCC_DYNLIB_IMPORT(module, "clGetProgramInfo")); + CLEW_CHECK_FUNCTION(__clewGetProgramBuildInfo = (PFNCLGETPROGRAMBUILDINFO )CLCC_DYNLIB_IMPORT(module, "clGetProgramBuildInfo")); + CLEW_CHECK_FUNCTION(__clewCreateKernel = (PFNCLCREATEKERNEL )CLCC_DYNLIB_IMPORT(module, "clCreateKernel")); + CLEW_CHECK_FUNCTION(__clewCreateKernelsInProgram = (PFNCLCREATEKERNELSINPROGRAM )CLCC_DYNLIB_IMPORT(module, "clCreateKernelsInProgram")); + CLEW_CHECK_FUNCTION(__clewRetainKernel = (PFNCLRETAINKERNEL )CLCC_DYNLIB_IMPORT(module, "clRetainKernel")); + CLEW_CHECK_FUNCTION(__clewReleaseKernel = (PFNCLRELEASEKERNEL )CLCC_DYNLIB_IMPORT(module, "clReleaseKernel")); + CLEW_CHECK_FUNCTION(__clewSetKernelArg = (PFNCLSETKERNELARG )CLCC_DYNLIB_IMPORT(module, "clSetKernelArg")); + CLEW_CHECK_FUNCTION(__clewGetKernelInfo = (PFNCLGETKERNELINFO )CLCC_DYNLIB_IMPORT(module, "clGetKernelInfo")); + CLEW_CHECK_FUNCTION(__clewGetKernelWorkGroupInfo = (PFNCLGETKERNELWORKGROUPINFO )CLCC_DYNLIB_IMPORT(module, "clGetKernelWorkGroupInfo")); + CLEW_CHECK_FUNCTION(__clewWaitForEvents = (PFNCLWAITFOREVENTS )CLCC_DYNLIB_IMPORT(module, "clWaitForEvents")); + CLEW_CHECK_FUNCTION(__clewGetEventInfo = (PFNCLGETEVENTINFO )CLCC_DYNLIB_IMPORT(module, "clGetEventInfo")); + CLEW_CHECK_FUNCTION(__clewRetainEvent = (PFNCLRETAINEVENT )CLCC_DYNLIB_IMPORT(module, "clRetainEvent")); + CLEW_CHECK_FUNCTION(__clewReleaseEvent = (PFNCLRELEASEEVENT )CLCC_DYNLIB_IMPORT(module, "clReleaseEvent")); + CLEW_CHECK_FUNCTION(__clewGetEventProfilingInfo = (PFNCLGETEVENTPROFILINGINFO )CLCC_DYNLIB_IMPORT(module, "clGetEventProfilingInfo")); + CLEW_CHECK_FUNCTION(__clewFlush = (PFNCLFLUSH )CLCC_DYNLIB_IMPORT(module, "clFlush")); + CLEW_CHECK_FUNCTION(__clewFinish = (PFNCLFINISH )CLCC_DYNLIB_IMPORT(module, "clFinish")); + CLEW_CHECK_FUNCTION(__clewEnqueueReadBuffer = (PFNCLENQUEUEREADBUFFER )CLCC_DYNLIB_IMPORT(module, "clEnqueueReadBuffer")); + CLEW_CHECK_FUNCTION(__clewEnqueueWriteBuffer = (PFNCLENQUEUEWRITEBUFFER )CLCC_DYNLIB_IMPORT(module, "clEnqueueWriteBuffer")); + CLEW_CHECK_FUNCTION(__clewEnqueueCopyBuffer = (PFNCLENQUEUECOPYBUFFER )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyBuffer")); + CLEW_CHECK_FUNCTION(__clewEnqueueReadImage = (PFNCLENQUEUEREADIMAGE )CLCC_DYNLIB_IMPORT(module, "clEnqueueReadImage")); + CLEW_CHECK_FUNCTION(__clewEnqueueWriteImage = (PFNCLENQUEUEWRITEIMAGE )CLCC_DYNLIB_IMPORT(module, "clEnqueueWriteImage")); + CLEW_CHECK_FUNCTION(__clewEnqueueCopyImage = (PFNCLENQUEUECOPYIMAGE )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyImage")); + CLEW_CHECK_FUNCTION(__clewEnqueueCopyImageToBuffer = (PFNCLENQUEUECOPYIMAGETOBUFFER )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyImageToBuffer")); + CLEW_CHECK_FUNCTION(__clewEnqueueCopyBufferToImage = (PFNCLENQUEUECOPYBUFFERTOIMAGE )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyBufferToImage")); + CLEW_CHECK_FUNCTION(__clewEnqueueMapBuffer = (PFNCLENQUEUEMAPBUFFER )CLCC_DYNLIB_IMPORT(module, "clEnqueueMapBuffer")); + CLEW_CHECK_FUNCTION(__clewEnqueueMapImage = (PFNCLENQUEUEMAPIMAGE )CLCC_DYNLIB_IMPORT(module, "clEnqueueMapImage")); + CLEW_CHECK_FUNCTION(__clewEnqueueUnmapMemObject = (PFNCLENQUEUEUNMAPMEMOBJECT )CLCC_DYNLIB_IMPORT(module, "clEnqueueUnmapMemObject")); + CLEW_CHECK_FUNCTION(__clewEnqueueNDRangeKernel = (PFNCLENQUEUENDRANGEKERNEL )CLCC_DYNLIB_IMPORT(module, "clEnqueueNDRangeKernel")); + CLEW_CHECK_FUNCTION(__clewEnqueueTask = (PFNCLENQUEUETASK )CLCC_DYNLIB_IMPORT(module, "clEnqueueTask")); + CLEW_CHECK_FUNCTION(__clewEnqueueNativeKernel = (PFNCLENQUEUENATIVEKERNEL )CLCC_DYNLIB_IMPORT(module, "clEnqueueNativeKernel")); + CLEW_CHECK_FUNCTION(__clewEnqueueMarker = (PFNCLENQUEUEMARKER )CLCC_DYNLIB_IMPORT(module, "clEnqueueMarker")); + CLEW_CHECK_FUNCTION(__clewEnqueueWaitForEvents = (PFNCLENQUEUEWAITFOREVENTS )CLCC_DYNLIB_IMPORT(module, "clEnqueueWaitForEvents")); + CLEW_CHECK_FUNCTION(__clewEnqueueBarrier = (PFNCLENQUEUEBARRIER )CLCC_DYNLIB_IMPORT(module, "clEnqueueBarrier")); + CLEW_CHECK_FUNCTION(__clewGetExtensionFunctionAddress = (PFNCLGETEXTENSIONFUNCTIONADDRESS )CLCC_DYNLIB_IMPORT(module, "clGetExtensionFunctionAddress")); + + return CLEW_SUCCESS; +} + +//! \param error CL error code +//! \return a string representation of the error code +const char* clewErrorString(cl_int error) +{ + static const char* strings[] = + { + // Error Codes + "CL_SUCCESS" // 0 + , "CL_DEVICE_NOT_FOUND" // -1 + , "CL_DEVICE_NOT_AVAILABLE" // -2 + , "CL_COMPILER_NOT_AVAILABLE" // -3 + , "CL_MEM_OBJECT_ALLOCATION_FAILURE" // -4 + , "CL_OUT_OF_RESOURCES" // -5 + , "CL_OUT_OF_HOST_MEMORY" // -6 + , "CL_PROFILING_INFO_NOT_AVAILABLE" // -7 + , "CL_MEM_COPY_OVERLAP" // -8 + , "CL_IMAGE_FORMAT_MISMATCH" // -9 + , "CL_IMAGE_FORMAT_NOT_SUPPORTED" // -10 + , "CL_BUILD_PROGRAM_FAILURE" // -11 + , "CL_MAP_FAILURE" // -12 + + , "" // -13 + , "" // -14 + , "" // -15 + , "" // -16 + , "" // -17 + , "" // -18 + , "" // -19 + + , "" // -20 + , "" // -21 + , "" // -22 + , "" // -23 + , "" // -24 + , "" // -25 + , "" // -26 + , "" // -27 + , "" // -28 + , "" // -29 + + , "CL_INVALID_VALUE" // -30 + , "CL_INVALID_DEVICE_TYPE" // -31 + , "CL_INVALID_PLATFORM" // -32 + , "CL_INVALID_DEVICE" // -33 + , "CL_INVALID_CONTEXT" // -34 + , "CL_INVALID_QUEUE_PROPERTIES" // -35 + , "CL_INVALID_COMMAND_QUEUE" // -36 + , "CL_INVALID_HOST_PTR" // -37 + , "CL_INVALID_MEM_OBJECT" // -38 + , "CL_INVALID_IMAGE_FORMAT_DESCRIPTOR" // -39 + , "CL_INVALID_IMAGE_SIZE" // -40 + , "CL_INVALID_SAMPLER" // -41 + , "CL_INVALID_BINARY" // -42 + , "CL_INVALID_BUILD_OPTIONS" // -43 + , "CL_INVALID_PROGRAM" // -44 + , "CL_INVALID_PROGRAM_EXECUTABLE" // -45 + , "CL_INVALID_KERNEL_NAME" // -46 + , "CL_INVALID_KERNEL_DEFINITION" // -47 + , "CL_INVALID_KERNEL" // -48 + , "CL_INVALID_ARG_INDEX" // -49 + , "CL_INVALID_ARG_VALUE" // -50 + , "CL_INVALID_ARG_SIZE" // -51 + , "CL_INVALID_KERNEL_ARGS" // -52 + , "CL_INVALID_WORK_DIMENSION" // -53 + , "CL_INVALID_WORK_GROUP_SIZE" // -54 + , "CL_INVALID_WORK_ITEM_SIZE" // -55 + , "CL_INVALID_GLOBAL_OFFSET" // -56 + , "CL_INVALID_EVENT_WAIT_LIST" // -57 + , "CL_INVALID_EVENT" // -58 + , "CL_INVALID_OPERATION" // -59 + , "CL_INVALID_GL_OBJECT" // -60 + , "CL_INVALID_BUFFER_SIZE" // -61 + , "CL_INVALID_MIP_LEVEL" // -62 + , "CL_INVALID_GLOBAL_WORK_SIZE" // -63 + }; + + if ( (error > 0) + || (error < -63) + ) + { + return "unknown error code (no OpenCL driver?)"; + } + + return strings[-error]; +} diff --git a/external/clew/source/include/clew/clew.h b/external/clew/source/include/clew/clew.h new file mode 100644 index 000000000..7b325d1dd --- /dev/null +++ b/external/clew/source/include/clew/clew.h @@ -0,0 +1,1187 @@ +#ifndef CLEW_CLEW_H_INCLUDED +#define CLEW_CLEW_H_INCLUDED + +////////////////////////////////////////////////////////////////////////// +// Copyright (c) 2009-2011 Organic Vectory B.V. +// Written by George van Venrooij +// +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file license.txt) +////////////////////////////////////////////////////////////////////////// + +//! \file clew.h +//! \brief OpenCL run-time loader header +//! +//! This file contains a copy of the contents of CL.H and CL_PLATFORM.H from the +//! official OpenCL spec. The purpose of this code is to load the OpenCL dynamic +//! library at run-time and thus allow the executable to function on many +//! platforms regardless of the vendor of the OpenCL driver actually installed. +//! Some of the techniques used here were inspired by work done in the GLEW +//! library (http://glew.sourceforge.net/) + +// Run-time dynamic linking functionality based on concepts used in GLEW +#ifdef __OPENCL_CL_H +#error cl.h included before clew.h +#endif + +#ifdef __OPENCL_CL_PLATFORM_H +#error cl_platform.h included before clew.h +#endif + +#ifndef CLCC_GENERATE_DOCUMENTATION +// Prevent cl.h inclusion +#define __OPENCL_CL_H +// Prevent cl_platform.h inclusion +#define __CL_PLATFORM_H +#endif // CLCC_GENERATE_DOCUMENTATION + +/******************************************************************************* +* Copyright (c) 2008-2009 The Khronos Group Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and/or associated documentation files (the +* "Materials"), to deal in the Materials without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sublicense, and/or sell copies of the Materials, and to +* permit persons to whom the Materials are furnished to do so, subject to +* the following conditions: +* +* The above copyright notice and this permission notice shall be included +* in all copies or substantial portions of the Materials. +* +* THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +******************************************************************************/ +#ifdef __APPLE__ +/* Contains #defines for AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER below */ +#include <AvailabilityMacros.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef CLCC_GENERATE_DOCUMENTATION + +#if defined(_WIN32) +#define CL_API_ENTRY +#define CL_API_CALL __stdcall +#else +#define CL_API_ENTRY +#define CL_API_CALL +#endif + +#if defined(__APPLE__) +#define CL_API_SUFFIX__VERSION_1_0 AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER +#define CL_EXTENSION_WEAK_LINK __attribute__((weak_import)) +#else +#define CL_API_SUFFIX__VERSION_1_0 +#define CL_EXTENSION_WEAK_LINK +#endif + +#if defined(_WIN32) && defined(_MSC_VER) + +/* scalar types */ +typedef signed __int8 cl_char; +typedef unsigned __int8 cl_uchar; +typedef signed __int16 cl_short; +typedef unsigned __int16 cl_ushort; +typedef signed __int32 cl_int; +typedef unsigned __int32 cl_uint; +typedef signed __int64 cl_long; +typedef unsigned __int64 cl_ulong; + +typedef unsigned __int16 cl_half; +typedef float cl_float; +typedef double cl_double; + + +/* +* Vector types +* +* Note: OpenCL requires that all types be naturally aligned. +* This means that vector types must be naturally aligned. +* For example, a vector of four floats must be aligned to +* a 16 byte boundary (calculated as 4 * the natural 4-byte +* alignment of the float). The alignment qualifiers here +* will only function properly if your compiler supports them +* and if you don't actively work to defeat them. For example, +* in order for a cl_float4 to be 16 byte aligned in a struct, +* the start of the struct must itself be 16-byte aligned. +* +* Maintaining proper alignment is the user's responsibility. +*/ +typedef signed __int8 cl_char2[2]; +typedef signed __int8 cl_char4[4]; +typedef signed __int8 cl_char8[8]; +typedef signed __int8 cl_char16[16]; +typedef unsigned __int8 cl_uchar2[2]; +typedef unsigned __int8 cl_uchar4[4]; +typedef unsigned __int8 cl_uchar8[8]; +typedef unsigned __int8 cl_uchar16[16]; + +typedef signed __int16 cl_short2[2]; +typedef signed __int16 cl_short4[4]; +typedef signed __int16 cl_short8[8]; +typedef signed __int16 cl_short16[16]; +typedef unsigned __int16 cl_ushort2[2]; +typedef unsigned __int16 cl_ushort4[4]; +typedef unsigned __int16 cl_ushort8[8]; +typedef unsigned __int16 cl_ushort16[16]; + +typedef signed __int32 cl_int2[2]; +typedef signed __int32 cl_int4[4]; +typedef signed __int32 cl_int8[8]; +typedef signed __int32 cl_int16[16]; +typedef unsigned __int32 cl_uint2[2]; +typedef unsigned __int32 cl_uint4[4]; +typedef unsigned __int32 cl_uint8[8]; +typedef unsigned __int32 cl_uint16[16]; + +typedef signed __int64 cl_long2[2]; +typedef signed __int64 cl_long4[4]; +typedef signed __int64 cl_long8[8]; +typedef signed __int64 cl_long16[16]; +typedef unsigned __int64 cl_ulong2[2]; +typedef unsigned __int64 cl_ulong4[4]; +typedef unsigned __int64 cl_ulong8[8]; +typedef unsigned __int64 cl_ulong16[16]; + +typedef float cl_float2[2]; +typedef float cl_float4[4]; +typedef float cl_float8[8]; +typedef float cl_float16[16]; + +typedef double cl_double2[2]; +typedef double cl_double4[4]; +typedef double cl_double8[8]; +typedef double cl_double16[16]; +/* There are no vector types for half */ + +#else + +#include <stdint.h> + +/* scalar types */ +typedef int8_t cl_char; +typedef uint8_t cl_uchar; +typedef int16_t cl_short __attribute__((aligned(2))); +typedef uint16_t cl_ushort __attribute__((aligned(2))); +typedef int32_t cl_int __attribute__((aligned(4))); +typedef uint32_t cl_uint __attribute__((aligned(4))); +typedef int64_t cl_long __attribute__((aligned(8))); +typedef uint64_t cl_ulong __attribute__((aligned(8))); + +typedef uint16_t cl_half __attribute__((aligned(2))); +typedef float cl_float __attribute__((aligned(4))); +typedef double cl_double __attribute__((aligned(8))); + +/* +* Vector types +* +* Note: OpenCL requires that all types be naturally aligned. +* This means that vector types must be naturally aligned. +* For example, a vector of four floats must be aligned to +* a 16 byte boundary (calculated as 4 * the natural 4-byte +* alignment of the float). The alignment qualifiers here +* will only function properly if your compiler supports them +* and if you don't actively work to defeat them. For example, +* in order for a cl_float4 to be 16 byte aligned in a struct, +* the start of the struct must itself be 16-byte aligned. +* +* Maintaining proper alignment is the user's responsibility. +*/ +typedef int8_t cl_char2[2] __attribute__((aligned(2))); +typedef int8_t cl_char4[4] __attribute__((aligned(4))); +typedef int8_t cl_char8[8] __attribute__((aligned(8))); +typedef int8_t cl_char16[16] __attribute__((aligned(16))); +typedef uint8_t cl_uchar2[2] __attribute__((aligned(2))); +typedef uint8_t cl_uchar4[4] __attribute__((aligned(4))); +typedef uint8_t cl_uchar8[8] __attribute__((aligned(8))); +typedef uint8_t cl_uchar16[16] __attribute__((aligned(16))); + +typedef int16_t cl_short2[2] __attribute__((aligned(4))); +typedef int16_t cl_short4[4] __attribute__((aligned(8))); +typedef int16_t cl_short8[8] __attribute__((aligned(16))); +typedef int16_t cl_short16[16] __attribute__((aligned(32))); +typedef uint16_t cl_ushort2[2] __attribute__((aligned(4))); +typedef uint16_t cl_ushort4[4] __attribute__((aligned(8))); +typedef uint16_t cl_ushort8[8] __attribute__((aligned(16))); +typedef uint16_t cl_ushort16[16] __attribute__((aligned(32))); + +typedef int32_t cl_int2[2] __attribute__((aligned(8))); +typedef int32_t cl_int4[4] __attribute__((aligned(16))); +typedef int32_t cl_int8[8] __attribute__((aligned(32))); +typedef int32_t cl_int16[16] __attribute__((aligned(64))); +typedef uint32_t cl_uint2[2] __attribute__((aligned(8))); +typedef uint32_t cl_uint4[4] __attribute__((aligned(16))); +typedef uint32_t cl_uint8[8] __attribute__((aligned(32))); +typedef uint32_t cl_uint16[16] __attribute__((aligned(64))); + +typedef int64_t cl_long2[2] __attribute__((aligned(16))); +typedef int64_t cl_long4[4] __attribute__((aligned(32))); +typedef int64_t cl_long8[8] __attribute__((aligned(64))); +typedef int64_t cl_long16[16] __attribute__((aligned(128))); +typedef uint64_t cl_ulong2[2] __attribute__((aligned(16))); +typedef uint64_t cl_ulong4[4] __attribute__((aligned(32))); +typedef uint64_t cl_ulong8[8] __attribute__((aligned(64))); +typedef uint64_t cl_ulong16[16] __attribute__((aligned(128))); + +typedef float cl_float2[2] __attribute__((aligned(8))); +typedef float cl_float4[4] __attribute__((aligned(16))); +typedef float cl_float8[8] __attribute__((aligned(32))); +typedef float cl_float16[16] __attribute__((aligned(64))); + +typedef double cl_double2[2] __attribute__((aligned(16))); +typedef double cl_double4[4] __attribute__((aligned(32))); +typedef double cl_double8[8] __attribute__((aligned(64))); +typedef double cl_double16[16] __attribute__((aligned(128))); + +/* There are no vector types for half */ + +#endif + +/******************************************************************************/ + +// Macro names and corresponding values defined by OpenCL + +#define CL_SCHAR_MAX 127 +#define CL_SCHAR_MIN (-127-1) +#define CL_SHRT_MIN (-32767-1) +#define CL_INT_MIN (-2147483647-1) +#define CL_LONG_MAX ((cl_long) 0x7FFFFFFFFFFFFFFFLL) +#define CL_LONG_MIN ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL) +#define CL_ULONG_MAX ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL) + +#define CL_FLT_MAX_10_EXP +38 +#define CL_FLT_MAX_EXP +128 +#define CL_FLT_MIN_10_EXP -37 +#define CL_FLT_MIN_EXP -125 +#if defined(_MSC_VER) +// MSVC doesn't understand hex floats +#define CL_FLT_MAX 3.402823466e+38F +#define CL_FLT_MIN 1.175494351e-38F +#define CL_FLT_EPSILON 1.192092896e-07F +#else +#define CL_FLT_MAX 0x1.fffffep127f +#define CL_FLT_MIN 0x1.0p-126f +#define CL_FLT_EPSILON 0x1.0p-23f +#endif + +#define CL_DBL_MAX_10_EXP +308 +#define CL_DBL_MAX_EXP +1024 +#define CL_DBL_MIN_10_EXP -307 +#define CL_DBL_MIN_EXP -1021 +#if defined(_MSC_VER) +// MSVC doesn't understand hex floats +#define CL_DBL_MAX 1.7976931348623158e+308 +#define CL_DBL_MIN 2.2250738585072014e-308 +#define CL_DBL_EPSILON 2.2204460492503131e-016 +#else +#define CL_DBL_MAX 0x1.fffffffffffffp1023 +#define CL_DBL_MIN 0x1.0p-1022 +#define CL_DBL_EPSILON 0x1.0p-52 +#endif + +#include <stddef.h> + + +// CL.h contents +/******************************************************************************/ + +typedef struct _cl_platform_id * cl_platform_id; +typedef struct _cl_device_id * cl_device_id; +typedef struct _cl_context * cl_context; +typedef struct _cl_command_queue * cl_command_queue; +typedef struct _cl_mem * cl_mem; +typedef struct _cl_program * cl_program; +typedef struct _cl_kernel * cl_kernel; +typedef struct _cl_event * cl_event; +typedef struct _cl_sampler * cl_sampler; + +typedef cl_uint cl_bool; /* WARNING! Unlike cl_ types in cl_platform.h, cl_bool is not guaranteed to be the same size as the bool in kernels. */ +typedef cl_ulong cl_bitfield; +typedef cl_bitfield cl_device_type; +typedef cl_uint cl_platform_info; +typedef cl_uint cl_device_info; +typedef cl_bitfield cl_device_address_info; +typedef cl_bitfield cl_device_fp_config; +typedef cl_uint cl_device_mem_cache_type; +typedef cl_uint cl_device_local_mem_type; +typedef cl_bitfield cl_device_exec_capabilities; +typedef cl_bitfield cl_command_queue_properties; + +typedef intptr_t cl_context_properties; +typedef cl_uint cl_context_info; +typedef cl_uint cl_command_queue_info; +typedef cl_uint cl_channel_order; +typedef cl_uint cl_channel_type; +typedef cl_bitfield cl_mem_flags; +typedef cl_uint cl_mem_object_type; +typedef cl_uint cl_mem_info; +typedef cl_uint cl_image_info; +typedef cl_uint cl_addressing_mode; +typedef cl_uint cl_filter_mode; +typedef cl_uint cl_sampler_info; +typedef cl_bitfield cl_map_flags; +typedef cl_uint cl_program_info; +typedef cl_uint cl_program_build_info; +typedef cl_int cl_build_status; +typedef cl_uint cl_kernel_info; +typedef cl_uint cl_kernel_work_group_info; +typedef cl_uint cl_event_info; +typedef cl_uint cl_command_type; +typedef cl_uint cl_profiling_info; + +typedef struct { + cl_channel_order image_channel_order; + cl_channel_type image_channel_data_type; +} cl_image_format; + + + +/******************************************************************************/ + +// Error Codes +#define CL_SUCCESS 0 +#define CL_DEVICE_NOT_FOUND -1 +#define CL_DEVICE_NOT_AVAILABLE -2 +#define CL_COMPILER_NOT_AVAILABLE -3 +#define CL_MEM_OBJECT_ALLOCATION_FAILURE -4 +#define CL_OUT_OF_RESOURCES -5 +#define CL_OUT_OF_HOST_MEMORY -6 +#define CL_PROFILING_INFO_NOT_AVAILABLE -7 +#define CL_MEM_COPY_OVERLAP -8 +#define CL_IMAGE_FORMAT_MISMATCH -9 +#define CL_IMAGE_FORMAT_NOT_SUPPORTED -10 +#define CL_BUILD_PROGRAM_FAILURE -11 +#define CL_MAP_FAILURE -12 + +#define CL_INVALID_VALUE -30 +#define CL_INVALID_DEVICE_TYPE -31 +#define CL_INVALID_PLATFORM -32 +#define CL_INVALID_DEVICE -33 +#define CL_INVALID_CONTEXT -34 +#define CL_INVALID_QUEUE_PROPERTIES -35 +#define CL_INVALID_COMMAND_QUEUE -36 +#define CL_INVALID_HOST_PTR -37 +#define CL_INVALID_MEM_OBJECT -38 +#define CL_INVALID_IMAGE_FORMAT_DESCRIPTOR -39 +#define CL_INVALID_IMAGE_SIZE -40 +#define CL_INVALID_SAMPLER -41 +#define CL_INVALID_BINARY -42 +#define CL_INVALID_BUILD_OPTIONS -43 +#define CL_INVALID_PROGRAM -44 +#define CL_INVALID_PROGRAM_EXECUTABLE -45 +#define CL_INVALID_KERNEL_NAME -46 +#define CL_INVALID_KERNEL_DEFINITION -47 +#define CL_INVALID_KERNEL -48 +#define CL_INVALID_ARG_INDEX -49 +#define CL_INVALID_ARG_VALUE -50 +#define CL_INVALID_ARG_SIZE -51 +#define CL_INVALID_KERNEL_ARGS -52 +#define CL_INVALID_WORK_DIMENSION -53 +#define CL_INVALID_WORK_GROUP_SIZE -54 +#define CL_INVALID_WORK_ITEM_SIZE -55 +#define CL_INVALID_GLOBAL_OFFSET -56 +#define CL_INVALID_EVENT_WAIT_LIST -57 +#define CL_INVALID_EVENT -58 +#define CL_INVALID_OPERATION -59 +#define CL_INVALID_GL_OBJECT -60 +#define CL_INVALID_BUFFER_SIZE -61 +#define CL_INVALID_MIP_LEVEL -62 +#define CL_INVALID_GLOBAL_WORK_SIZE -63 + +// cl_bool +#define CL_TRUE 1 + +// cl_platform_info +#define CL_PLATFORM_PROFILE 0x0900 +#define CL_PLATFORM_VERSION 0x0901 +#define CL_PLATFORM_NAME 0x0902 +#define CL_PLATFORM_VENDOR 0x0903 +#define CL_PLATFORM_EXTENSIONS 0x0904 + +// cl_device_type - bitfield +#define CL_DEVICE_TYPE_DEFAULT (1 << 0) +#define CL_DEVICE_TYPE_CPU (1 << 1) +#define CL_DEVICE_TYPE_GPU (1 << 2) +#define CL_DEVICE_TYPE_ACCELERATOR (1 << 3) +#define CL_DEVICE_TYPE_CUSTOM (1 << 4) +#define CL_DEVICE_TYPE_ALL 0xFFFFFFFF + +// cl_device_info +#define CL_DEVICE_TYPE 0x1000 +#define CL_DEVICE_VENDOR_ID 0x1001 +#define CL_DEVICE_MAX_COMPUTE_UNITS 0x1002 +#define CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS 0x1003 +#define CL_DEVICE_MAX_WORK_GROUP_SIZE 0x1004 +#define CL_DEVICE_MAX_WORK_ITEM_SIZES 0x1005 +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR 0x1006 +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT 0x1007 +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT 0x1008 +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG 0x1009 +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT 0x100A +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE 0x100B +#define CL_DEVICE_MAX_CLOCK_FREQUENCY 0x100C +#define CL_DEVICE_ADDRESS_BITS 0x100D +#define CL_DEVICE_MAX_READ_IMAGE_ARGS 0x100E +#define CL_DEVICE_MAX_WRITE_IMAGE_ARGS 0x100F +#define CL_DEVICE_MAX_MEM_ALLOC_SIZE 0x1010 +#define CL_DEVICE_IMAGE2D_MAX_WIDTH 0x1011 +#define CL_DEVICE_IMAGE2D_MAX_HEIGHT 0x1012 +#define CL_DEVICE_IMAGE3D_MAX_WIDTH 0x1013 +#define CL_DEVICE_IMAGE3D_MAX_HEIGHT 0x1014 +#define CL_DEVICE_IMAGE3D_MAX_DEPTH 0x1015 +#define CL_DEVICE_IMAGE_SUPPORT 0x1016 +#define CL_DEVICE_MAX_PARAMETER_SIZE 0x1017 +#define CL_DEVICE_MAX_SAMPLERS 0x1018 +#define CL_DEVICE_MEM_BASE_ADDR_ALIGN 0x1019 +#define CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE 0x101A +#define CL_DEVICE_SINGLE_FP_CONFIG 0x101B +#define CL_DEVICE_GLOBAL_MEM_CACHE_TYPE 0x101C +#define CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE 0x101D +#define CL_DEVICE_GLOBAL_MEM_CACHE_SIZE 0x101E +#define CL_DEVICE_GLOBAL_MEM_SIZE 0x101F +#define CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE 0x1020 +#define CL_DEVICE_MAX_CONSTANT_ARGS 0x1021 +#define CL_DEVICE_LOCAL_MEM_TYPE 0x1022 +#define CL_DEVICE_LOCAL_MEM_SIZE 0x1023 +#define CL_DEVICE_ERROR_CORRECTION_SUPPORT 0x1024 +#define CL_DEVICE_PROFILING_TIMER_RESOLUTION 0x1025 +#define CL_DEVICE_ENDIAN_LITTLE 0x1026 +#define CL_DEVICE_AVAILABLE 0x1027 +#define CL_DEVICE_COMPILER_AVAILABLE 0x1028 +#define CL_DEVICE_EXECUTION_CAPABILITIES 0x1029 +#define CL_DEVICE_QUEUE_PROPERTIES 0x102A +#define CL_DEVICE_NAME 0x102B +#define CL_DEVICE_VENDOR 0x102C +#define CL_DRIVER_VERSION 0x102D +#define CL_DEVICE_PROFILE 0x102E +#define CL_DEVICE_VERSION 0x102F +#define CL_DEVICE_EXTENSIONS 0x1030 +#define CL_DEVICE_PLATFORM 0x1031 +#define CL_DEVICE_DOUBLE_FP_CONFIG 0x1032 +/* 0x1033 reserved for CL_DEVICE_HALF_FP_CONFIG */ +#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF 0x1034 +#define CL_DEVICE_HOST_UNIFIED_MEMORY 0x1035 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR 0x1036 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT 0x1037 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_INT 0x1038 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG 0x1039 +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT 0x103A +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE 0x103B +#define CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF 0x103C +#define CL_DEVICE_OPENCL_C_VERSION 0x103D +#define CL_DEVICE_LINKER_AVAILABLE 0x103E +#define CL_DEVICE_BUILT_IN_KERNELS 0x103F +#define CL_DEVICE_IMAGE_MAX_BUFFER_SIZE 0x1040 +#define CL_DEVICE_IMAGE_MAX_ARRAY_SIZE 0x1041 +#define CL_DEVICE_PARENT_DEVICE 0x1042 +#define CL_DEVICE_PARTITION_MAX_SUB_DEVICES 0x1043 +#define CL_DEVICE_PARTITION_PROPERTIES 0x1044 +#define CL_DEVICE_PARTITION_AFFINITY_DOMAIN 0x1045 +#define CL_DEVICE_PARTITION_TYPE 0x1046 +#define CL_DEVICE_REFERENCE_COUNT 0x1047 +#define CL_DEVICE_PREFERRED_INTEROP_USER_SYNC 0x1048 +#define CL_DEVICE_PRINTF_BUFFER_SIZE 0x1049 +#define CL_DEVICE_IMAGE_PITCH_ALIGNMENT 0x104A +#define CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT 0x104B + +// cl_device_fp_config - bitfield +#define CL_FP_DENORM (1 << 0) +#define CL_FP_INF_NAN (1 << 1) +#define CL_FP_ROUND_TO_NEAREST (1 << 2) +#define CL_FP_ROUND_TO_ZERO (1 << 3) +#define CL_FP_ROUND_TO_INF (1 << 4) +#define CL_FP_FMA (1 << 5) + +// cl_device_exec_capabilities - bitfield +#define CL_EXEC_KERNEL (1 << 0) +#define CL_EXEC_NATIVE_KERNEL (1 << 1) + +// cl_command_queue_properties - bitfield +#define CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE (1 << 0) +#define CL_QUEUE_PROFILING_ENABLE (1 << 1) + +// cl_context_info +#define CL_CONTEXT_DEVICES 0x1081 + +// cl_context_properties +#define CL_CONTEXT_PLATFORM 0x1084 + +// cl_mem_flags - bitfield +#define CL_MEM_READ_WRITE (1 << 0) +#define CL_MEM_WRITE_ONLY (1 << 1) +#define CL_MEM_READ_ONLY (1 << 2) +#define CL_MEM_USE_HOST_PTR (1 << 3) +#define CL_MEM_ALLOC_HOST_PTR (1 << 4) +#define CL_MEM_COPY_HOST_PTR (1 << 5) + +// cl_map_flags - bitfield +#define CL_MAP_READ (1 << 0) +#define CL_MAP_WRITE (1 << 1) + +// cl_program_info +#define CL_PROGRAM_NUM_DEVICES 0x1162 +#define CL_PROGRAM_DEVICES 0x1163 +#define CL_PROGRAM_BINARY_SIZES 0x1165 +#define CL_PROGRAM_BINARIES 0x1166 + +// cl_program_build_info +#define CL_PROGRAM_BUILD_STATUS 0x1181 +#define CL_PROGRAM_BUILD_LOG 0x1183 + +// cl_build_status +#define CL_BUILD_NONE -1 +#define CL_BUILD_ERROR -2 +#define CL_BUILD_IN_PROGRESS -3 + +/********************************************************************************************************/ + +/********************************************************************************************************/ + +// Function signature typedef's + +// Platform API +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETPLATFORMIDS)(cl_uint /* num_entries */, + cl_platform_id * /* platforms */, + cl_uint * /* num_platforms */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETPLATFORMINFO)(cl_platform_id /* platform */, + cl_platform_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Device APIs +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETDEVICEIDS)(cl_platform_id /* platform */, + cl_device_type /* device_type */, + cl_uint /* num_entries */, + cl_device_id * /* devices */, + cl_uint * /* num_devices */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETDEVICEINFO)(cl_device_id /* device */, + cl_device_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Context APIs +typedef CL_API_ENTRY cl_context (CL_API_CALL * +PFNCLCREATECONTEXT)(const cl_context_properties * /* properties */, + cl_uint /* num_devices */, + const cl_device_id * /* devices */, + void (*pfn_notify)(const char *, const void *, size_t, void *) /* pfn_notify */, + void * /* user_data */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_context (CL_API_CALL * +PFNCLCREATECONTEXTFROMTYPE)(const cl_context_properties * /* properties */, + cl_device_type /* device_type */, + void (*pfn_notify)(const char *, const void *, size_t, void *) /* pfn_notify */, + void * /* user_data */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINCONTEXT)(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASECONTEXT)(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETCONTEXTINFO)(cl_context /* context */, + cl_context_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Command Queue APIs +typedef CL_API_ENTRY cl_command_queue (CL_API_CALL * +PFNCLCREATECOMMANDQUEUE)(cl_context /* context */, + cl_device_id /* device */, + cl_command_queue_properties /* properties */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINCOMMANDQUEUE)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASECOMMANDQUEUE)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETCOMMANDQUEUEINFO)(cl_command_queue /* command_queue */, + cl_command_queue_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLSETCOMMANDQUEUEPROPERTY)(cl_command_queue /* command_queue */, + cl_command_queue_properties /* properties */, + cl_bool /* enable */, + cl_command_queue_properties * /* old_properties */) CL_API_SUFFIX__VERSION_1_0; + +// Memory Object APIs +typedef CL_API_ENTRY cl_mem (CL_API_CALL * +PFNCLCREATEBUFFER)(cl_context /* context */, + cl_mem_flags /* flags */, + size_t /* size */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL * +PFNCLCREATEIMAGE2D)(cl_context /* context */, + cl_mem_flags /* flags */, + const cl_image_format * /* image_format */, + size_t /* image_width */, + size_t /* image_height */, + size_t /* image_row_pitch */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_mem (CL_API_CALL * +PFNCLCREATEIMAGE3D)(cl_context /* context */, + cl_mem_flags /* flags */, + const cl_image_format * /* image_format */, + size_t /* image_width */, + size_t /* image_height */, + size_t /* image_depth */, + size_t /* image_row_pitch */, + size_t /* image_slice_pitch */, + void * /* host_ptr */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINMEMOBJECT)(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASEMEMOBJECT)(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETSUPPORTEDIMAGEFORMATS)(cl_context /* context */, + cl_mem_flags /* flags */, + cl_mem_object_type /* image_type */, + cl_uint /* num_entries */, + cl_image_format * /* image_formats */, + cl_uint * /* num_image_formats */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETMEMOBJECTINFO)(cl_mem /* memobj */, + cl_mem_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETIMAGEINFO)(cl_mem /* image */, + cl_image_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Sampler APIs +typedef CL_API_ENTRY cl_sampler (CL_API_CALL * +PFNCLCREATESAMPLER)(cl_context /* context */, + cl_bool /* normalized_coords */, + cl_addressing_mode /* addressing_mode */, + cl_filter_mode /* filter_mode */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINSAMPLER)(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASESAMPLER)(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETSAMPLERINFO)(cl_sampler /* sampler */, + cl_sampler_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Program Object APIs +typedef CL_API_ENTRY cl_program (CL_API_CALL * +PFNCLCREATEPROGRAMWITHSOURCE)(cl_context /* context */, + cl_uint /* count */, + const char ** /* strings */, + const size_t * /* lengths */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_program (CL_API_CALL * +PFNCLCREATEPROGRAMWITHBINARY)(cl_context /* context */, + cl_uint /* num_devices */, + const cl_device_id * /* device_list */, + const size_t * /* lengths */, + const unsigned char ** /* binaries */, + cl_int * /* binary_status */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINPROGRAM)(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASEPROGRAM)(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLBUILDPROGRAM)(cl_program /* program */, + cl_uint /* num_devices */, + const cl_device_id * /* device_list */, + const char * /* options */, + void (*pfn_notify)(cl_program /* program */, void * /* user_data */), + void * /* user_data */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLUNLOADCOMPILER)(void) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETPROGRAMINFO)(cl_program /* program */, + cl_program_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETPROGRAMBUILDINFO)(cl_program /* program */, + cl_device_id /* device */, + cl_program_build_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Kernel Object APIs +typedef CL_API_ENTRY cl_kernel (CL_API_CALL * +PFNCLCREATEKERNEL)(cl_program /* program */, + const char * /* kernel_name */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLCREATEKERNELSINPROGRAM)(cl_program /* program */, + cl_uint /* num_kernels */, + cl_kernel * /* kernels */, + cl_uint * /* num_kernels_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINKERNEL)(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASEKERNEL)(cl_kernel /* kernel */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLSETKERNELARG)(cl_kernel /* kernel */, + cl_uint /* arg_index */, + size_t /* arg_size */, + const void * /* arg_value */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETKERNELINFO)(cl_kernel /* kernel */, + cl_kernel_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETKERNELWORKGROUPINFO)(cl_kernel /* kernel */, + cl_device_id /* device */, + cl_kernel_work_group_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Event Object APIs +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLWAITFOREVENTS)(cl_uint /* num_events */, + const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETEVENTINFO)(cl_event /* event */, + cl_event_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRETAINEVENT)(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLRELEASEEVENT)(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0; + +// Profiling APIs +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLGETEVENTPROFILINGINFO)(cl_event /* event */, + cl_profiling_info /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; + +// Flush and Finish APIs +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLFLUSH)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLFINISH)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; + +// Enqueued Commands APIs +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEREADBUFFER)(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_read */, + size_t /* offset */, + size_t /* cb */, + void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEWRITEBUFFER)(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_write */, + size_t /* offset */, + size_t /* cb */, + const void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUECOPYBUFFER)(cl_command_queue /* command_queue */, + cl_mem /* src_buffer */, + cl_mem /* dst_buffer */, + size_t /* src_offset */, + size_t /* dst_offset */, + size_t /* cb */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEREADIMAGE)(cl_command_queue /* command_queue */, + cl_mem /* image */, + cl_bool /* blocking_read */, + const size_t * /* origin[3] */, + const size_t * /* region[3] */, + size_t /* row_pitch */, + size_t /* slice_pitch */, + void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEWRITEIMAGE)(cl_command_queue /* command_queue */, + cl_mem /* image */, + cl_bool /* blocking_write */, + const size_t * /* origin[3] */, + const size_t * /* region[3] */, + size_t /* input_row_pitch */, + size_t /* input_slice_pitch */, + const void * /* ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUECOPYIMAGE)(cl_command_queue /* command_queue */, + cl_mem /* src_image */, + cl_mem /* dst_image */, + const size_t * /* src_origin[3] */, + const size_t * /* dst_origin[3] */, + const size_t * /* region[3] */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUECOPYIMAGETOBUFFER)(cl_command_queue /* command_queue */, + cl_mem /* src_image */, + cl_mem /* dst_buffer */, + const size_t * /* src_origin[3] */, + const size_t * /* region[3] */, + size_t /* dst_offset */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUECOPYBUFFERTOIMAGE)(cl_command_queue /* command_queue */, + cl_mem /* src_buffer */, + cl_mem /* dst_image */, + size_t /* src_offset */, + const size_t * /* dst_origin[3] */, + const size_t * /* region[3] */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY void * (CL_API_CALL * +PFNCLENQUEUEMAPBUFFER)(cl_command_queue /* command_queue */, + cl_mem /* buffer */, + cl_bool /* blocking_map */, + cl_map_flags /* map_flags */, + size_t /* offset */, + size_t /* cb */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY void * (CL_API_CALL * +PFNCLENQUEUEMAPIMAGE)(cl_command_queue /* command_queue */, + cl_mem /* image */, + cl_bool /* blocking_map */, + cl_map_flags /* map_flags */, + const size_t * /* origin[3] */, + const size_t * /* region[3] */, + size_t * /* image_row_pitch */, + size_t * /* image_slice_pitch */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEUNMAPMEMOBJECT)(cl_command_queue /* command_queue */, + cl_mem /* memobj */, + void * /* mapped_ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUENDRANGEKERNEL)(cl_command_queue /* command_queue */, + cl_kernel /* kernel */, + cl_uint /* work_dim */, + const size_t * /* global_work_offset */, + const size_t * /* global_work_size */, + const size_t * /* local_work_size */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUETASK)(cl_command_queue /* command_queue */, + cl_kernel /* kernel */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUENATIVEKERNEL)(cl_command_queue /* command_queue */, + void (*user_func)(void *), + void * /* args */, + size_t /* cb_args */, + cl_uint /* num_mem_objects */, + const cl_mem * /* mem_list */, + const void ** /* args_mem_loc */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEMARKER)(cl_command_queue /* command_queue */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEWAITFOREVENTS)(cl_command_queue /* command_queue */, + cl_uint /* num_events */, + const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0; + +typedef CL_API_ENTRY cl_int (CL_API_CALL * +PFNCLENQUEUEBARRIER)(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0; + +// Extension function access +// +// Returns the extension function address for the given function name, +// or NULL if a valid function can not be found. The client must +// check to make sure the address is not NULL, before using or +// calling the returned function address. +// +typedef CL_API_ENTRY void * (CL_API_CALL * PFNCLGETEXTENSIONFUNCTIONADDRESS)(const char * /* func_name */) CL_API_SUFFIX__VERSION_1_0; + +#ifdef CLEW_STATIC +# define CLEWAPI extern +#else +# ifdef CLEW_BUILD +# if defined(_WIN32) +# define CLEWAPI extern __declspec(dllexport) +# else +# define CLEWAPI extern __attribute__ ((visibility("default"))) +# endif +# else +# if defined(_WIN32) +# define CLEWAPI extern __declspec(dllimport) +# else +# define CLEWAPI extern +# endif +# endif +#endif + +#define CLEW_FUN_EXPORT CLEWAPI + +#define CLEW_GET_FUN(x) x + + +// Variables holding function entry points +CLEW_FUN_EXPORT PFNCLGETPLATFORMIDS __clewGetPlatformIDs ; +CLEW_FUN_EXPORT PFNCLGETPLATFORMINFO __clewGetPlatformInfo ; +CLEW_FUN_EXPORT PFNCLGETDEVICEIDS __clewGetDeviceIDs ; +CLEW_FUN_EXPORT PFNCLGETDEVICEINFO __clewGetDeviceInfo ; +CLEW_FUN_EXPORT PFNCLCREATECONTEXT __clewCreateContext ; +CLEW_FUN_EXPORT PFNCLCREATECONTEXTFROMTYPE __clewCreateContextFromType ; +CLEW_FUN_EXPORT PFNCLRETAINCONTEXT __clewRetainContext ; +CLEW_FUN_EXPORT PFNCLRELEASECONTEXT __clewReleaseContext ; +CLEW_FUN_EXPORT PFNCLGETCONTEXTINFO __clewGetContextInfo ; +CLEW_FUN_EXPORT PFNCLCREATECOMMANDQUEUE __clewCreateCommandQueue ; +CLEW_FUN_EXPORT PFNCLRETAINCOMMANDQUEUE __clewRetainCommandQueue ; +CLEW_FUN_EXPORT PFNCLRELEASECOMMANDQUEUE __clewReleaseCommandQueue ; +CLEW_FUN_EXPORT PFNCLGETCOMMANDQUEUEINFO __clewGetCommandQueueInfo ; +CLEW_FUN_EXPORT PFNCLSETCOMMANDQUEUEPROPERTY __clewSetCommandQueueProperty ; +CLEW_FUN_EXPORT PFNCLCREATEBUFFER __clewCreateBuffer ; +CLEW_FUN_EXPORT PFNCLCREATEIMAGE2D __clewCreateImage2D ; +CLEW_FUN_EXPORT PFNCLCREATEIMAGE3D __clewCreateImage3D ; +CLEW_FUN_EXPORT PFNCLRETAINMEMOBJECT __clewRetainMemObject ; +CLEW_FUN_EXPORT PFNCLRELEASEMEMOBJECT __clewReleaseMemObject ; +CLEW_FUN_EXPORT PFNCLGETSUPPORTEDIMAGEFORMATS __clewGetSupportedImageFormats ; +CLEW_FUN_EXPORT PFNCLGETMEMOBJECTINFO __clewGetMemObjectInfo ; +CLEW_FUN_EXPORT PFNCLGETIMAGEINFO __clewGetImageInfo ; +CLEW_FUN_EXPORT PFNCLCREATESAMPLER __clewCreateSampler ; +CLEW_FUN_EXPORT PFNCLRETAINSAMPLER __clewRetainSampler ; +CLEW_FUN_EXPORT PFNCLRELEASESAMPLER __clewReleaseSampler ; +CLEW_FUN_EXPORT PFNCLGETSAMPLERINFO __clewGetSamplerInfo ; +CLEW_FUN_EXPORT PFNCLCREATEPROGRAMWITHSOURCE __clewCreateProgramWithSource ; +CLEW_FUN_EXPORT PFNCLCREATEPROGRAMWITHBINARY __clewCreateProgramWithBinary ; +CLEW_FUN_EXPORT PFNCLRETAINPROGRAM __clewRetainProgram ; +CLEW_FUN_EXPORT PFNCLRELEASEPROGRAM __clewReleaseProgram ; +CLEW_FUN_EXPORT PFNCLBUILDPROGRAM __clewBuildProgram ; +CLEW_FUN_EXPORT PFNCLUNLOADCOMPILER __clewUnloadCompiler ; +CLEW_FUN_EXPORT PFNCLGETPROGRAMINFO __clewGetProgramInfo ; +CLEW_FUN_EXPORT PFNCLGETPROGRAMBUILDINFO __clewGetProgramBuildInfo ; +CLEW_FUN_EXPORT PFNCLCREATEKERNEL __clewCreateKernel ; +CLEW_FUN_EXPORT PFNCLCREATEKERNELSINPROGRAM __clewCreateKernelsInProgram ; +CLEW_FUN_EXPORT PFNCLRETAINKERNEL __clewRetainKernel ; +CLEW_FUN_EXPORT PFNCLRELEASEKERNEL __clewReleaseKernel ; +CLEW_FUN_EXPORT PFNCLSETKERNELARG __clewSetKernelArg ; +CLEW_FUN_EXPORT PFNCLGETKERNELINFO __clewGetKernelInfo ; +CLEW_FUN_EXPORT PFNCLGETKERNELWORKGROUPINFO __clewGetKernelWorkGroupInfo ; +CLEW_FUN_EXPORT PFNCLWAITFOREVENTS __clewWaitForEvents ; +CLEW_FUN_EXPORT PFNCLGETEVENTINFO __clewGetEventInfo ; +CLEW_FUN_EXPORT PFNCLRETAINEVENT __clewRetainEvent ; +CLEW_FUN_EXPORT PFNCLRELEASEEVENT __clewReleaseEvent ; +CLEW_FUN_EXPORT PFNCLGETEVENTPROFILINGINFO __clewGetEventProfilingInfo ; +CLEW_FUN_EXPORT PFNCLFLUSH __clewFlush ; +CLEW_FUN_EXPORT PFNCLFINISH __clewFinish ; +CLEW_FUN_EXPORT PFNCLENQUEUEREADBUFFER __clewEnqueueReadBuffer ; +CLEW_FUN_EXPORT PFNCLENQUEUEWRITEBUFFER __clewEnqueueWriteBuffer ; +CLEW_FUN_EXPORT PFNCLENQUEUECOPYBUFFER __clewEnqueueCopyBuffer ; +CLEW_FUN_EXPORT PFNCLENQUEUEREADIMAGE __clewEnqueueReadImage ; +CLEW_FUN_EXPORT PFNCLENQUEUEWRITEIMAGE __clewEnqueueWriteImage ; +CLEW_FUN_EXPORT PFNCLENQUEUECOPYIMAGE __clewEnqueueCopyImage ; +CLEW_FUN_EXPORT PFNCLENQUEUECOPYIMAGETOBUFFER __clewEnqueueCopyImageToBuffer ; +CLEW_FUN_EXPORT PFNCLENQUEUECOPYBUFFERTOIMAGE __clewEnqueueCopyBufferToImage ; +CLEW_FUN_EXPORT PFNCLENQUEUEMAPBUFFER __clewEnqueueMapBuffer ; +CLEW_FUN_EXPORT PFNCLENQUEUEMAPIMAGE __clewEnqueueMapImage ; +CLEW_FUN_EXPORT PFNCLENQUEUEUNMAPMEMOBJECT __clewEnqueueUnmapMemObject ; +CLEW_FUN_EXPORT PFNCLENQUEUENDRANGEKERNEL __clewEnqueueNDRangeKernel ; +CLEW_FUN_EXPORT PFNCLENQUEUETASK __clewEnqueueTask ; +CLEW_FUN_EXPORT PFNCLENQUEUENATIVEKERNEL __clewEnqueueNativeKernel ; +CLEW_FUN_EXPORT PFNCLENQUEUEMARKER __clewEnqueueMarker ; +CLEW_FUN_EXPORT PFNCLENQUEUEWAITFOREVENTS __clewEnqueueWaitForEvents ; +CLEW_FUN_EXPORT PFNCLENQUEUEBARRIER __clewEnqueueBarrier ; +CLEW_FUN_EXPORT PFNCLGETEXTENSIONFUNCTIONADDRESS __clewGetExtensionFunctionAddress ; + + +#define clGetPlatformIDs CLEW_GET_FUN(__clewGetPlatformIDs ) +#define clGetPlatformInfo CLEW_GET_FUN(__clewGetPlatformInfo ) +#define clGetDeviceIDs CLEW_GET_FUN(__clewGetDeviceIDs ) +#define clGetDeviceInfo CLEW_GET_FUN(__clewGetDeviceInfo ) +#define clCreateContext CLEW_GET_FUN(__clewCreateContext ) +#define clCreateContextFromType CLEW_GET_FUN(__clewCreateContextFromType ) +#define clRetainContext CLEW_GET_FUN(__clewRetainContext ) +#define clReleaseContext CLEW_GET_FUN(__clewReleaseContext ) +#define clGetContextInfo CLEW_GET_FUN(__clewGetContextInfo ) +#define clCreateCommandQueue CLEW_GET_FUN(__clewCreateCommandQueue ) +#define clRetainCommandQueue CLEW_GET_FUN(__clewRetainCommandQueue ) +#define clReleaseCommandQueue CLEW_GET_FUN(__clewReleaseCommandQueue ) +#define clGetCommandQueueInfo CLEW_GET_FUN(__clewGetCommandQueueInfo ) +#define clSetCommandQueueProperty CLEW_GET_FUN(__clewSetCommandQueueProperty ) +#define clCreateBuffer CLEW_GET_FUN(__clewCreateBuffer ) +#define clCreateImage2D CLEW_GET_FUN(__clewCreateImage2D ) +#define clCreateImage3D CLEW_GET_FUN(__clewCreateImage3D ) +#define clRetainMemObject CLEW_GET_FUN(__clewRetainMemObject ) +#define clReleaseMemObject CLEW_GET_FUN(__clewReleaseMemObject ) +#define clGetSupportedImageFormats CLEW_GET_FUN(__clewGetSupportedImageFormats ) +#define clGetMemObjectInfo CLEW_GET_FUN(__clewGetMemObjectInfo ) +#define clGetImageInfo CLEW_GET_FUN(__clewGetImageInfo ) +#define clCreateSampler CLEW_GET_FUN(__clewCreateSampler ) +#define clRetainSampler CLEW_GET_FUN(__clewRetainSampler ) +#define clReleaseSampler CLEW_GET_FUN(__clewReleaseSampler ) +#define clGetSamplerInfo CLEW_GET_FUN(__clewGetSamplerInfo ) +#define clCreateProgramWithSource CLEW_GET_FUN(__clewCreateProgramWithSource ) +#define clCreateProgramWithBinary CLEW_GET_FUN(__clewCreateProgramWithBinary ) +#define clRetainProgram CLEW_GET_FUN(__clewRetainProgram ) +#define clReleaseProgram CLEW_GET_FUN(__clewReleaseProgram ) +#define clBuildProgram CLEW_GET_FUN(__clewBuildProgram ) +#define clUnloadCompiler CLEW_GET_FUN(__clewUnloadCompiler ) +#define clGetProgramInfo CLEW_GET_FUN(__clewGetProgramInfo ) +#define clGetProgramBuildInfo CLEW_GET_FUN(__clewGetProgramBuildInfo ) +#define clCreateKernel CLEW_GET_FUN(__clewCreateKernel ) +#define clCreateKernelsInProgram CLEW_GET_FUN(__clewCreateKernelsInProgram ) +#define clRetainKernel CLEW_GET_FUN(__clewRetainKernel ) +#define clReleaseKernel CLEW_GET_FUN(__clewReleaseKernel ) +#define clSetKernelArg CLEW_GET_FUN(__clewSetKernelArg ) +#define clGetKernelInfo CLEW_GET_FUN(__clewGetKernelInfo ) +#define clGetKernelWorkGroupInfo CLEW_GET_FUN(__clewGetKernelWorkGroupInfo ) +#define clWaitForEvents CLEW_GET_FUN(__clewWaitForEvents ) +#define clGetEventInfo CLEW_GET_FUN(__clewGetEventInfo ) +#define clRetainEvent CLEW_GET_FUN(__clewRetainEvent ) +#define clReleaseEvent CLEW_GET_FUN(__clewReleaseEvent ) +#define clGetEventProfilingInfo CLEW_GET_FUN(__clewGetEventProfilingInfo ) +#define clFlush CLEW_GET_FUN(__clewFlush ) +#define clFinish CLEW_GET_FUN(__clewFinish ) +#define clEnqueueReadBuffer CLEW_GET_FUN(__clewEnqueueReadBuffer ) +#define clEnqueueWriteBuffer CLEW_GET_FUN(__clewEnqueueWriteBuffer ) +#define clEnqueueCopyBuffer CLEW_GET_FUN(__clewEnqueueCopyBuffer ) +#define clEnqueueReadImage CLEW_GET_FUN(__clewEnqueueReadImage ) +#define clEnqueueWriteImage CLEW_GET_FUN(__clewEnqueueWriteImage ) +#define clEnqueueCopyImage CLEW_GET_FUN(__clewEnqueueCopyImage ) +#define clEnqueueCopyImageToBuffer CLEW_GET_FUN(__clewEnqueueCopyImageToBuffer ) +#define clEnqueueCopyBufferToImage CLEW_GET_FUN(__clewEnqueueCopyBufferToImage ) +#define clEnqueueMapBuffer CLEW_GET_FUN(__clewEnqueueMapBuffer ) +#define clEnqueueMapImage CLEW_GET_FUN(__clewEnqueueMapImage ) +#define clEnqueueUnmapMemObject CLEW_GET_FUN(__clewEnqueueUnmapMemObject ) +#define clEnqueueNDRangeKernel CLEW_GET_FUN(__clewEnqueueNDRangeKernel ) +#define clEnqueueTask CLEW_GET_FUN(__clewEnqueueTask ) +#define clEnqueueNativeKernel CLEW_GET_FUN(__clewEnqueueNativeKernel ) +#define clEnqueueMarker CLEW_GET_FUN(__clewEnqueueMarker ) +#define clEnqueueWaitForEvents CLEW_GET_FUN(__clewEnqueueWaitForEvents ) +#define clEnqueueBarrier CLEW_GET_FUN(__clewEnqueueBarrier ) +#define clGetExtensionFunctionAddress CLEW_GET_FUN(__clewGetExtensionFunctionAddress ) + +#endif // CLCC_GENERATE_DOCUMENTATION + +#define CLEW_SUCCESS 0 //!< Success error code +#define CLEW_ERROR_OPEN_FAILED -1 //!< Error code for failing to open the dynamic library +#define CLEW_ERROR_ATEXIT_FAILED -2 //!< Error code for failing to queue the closing of the dynamic library to atexit() +#define CLEW_ERROR_IMPORT_FAILED -3 //!< Error code for failing to import a named function from the dll + +//! \brief Load OpenCL dynamic library and set function entry points +CLEW_FUN_EXPORT int clewInit (const char*); +//! \brief Convert an OpenCL error code to its string equivalent +CLEW_FUN_EXPORT const char* clewErrorString (cl_int error); + +#ifdef __cplusplus +} +#endif + +#endif // CLEW_CLEW_H_INCLUDED diff --git a/external/clucene/Library_clucene.mk b/external/clucene/Library_clucene.mk new file mode 100644 index 000000000..6f585f6f2 --- /dev/null +++ b/external/clucene/Library_clucene.mk @@ -0,0 +1,233 @@ +# -*- 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_Library_Library,clucene)) + +$(eval $(call gb_Library_use_external,clucene,zlib)) + +$(eval $(call gb_Library_use_unpacked,clucene,clucene)) + +$(eval $(call gb_Library_set_warnings_disabled,clucene)) + +$(eval $(call gb_Library_set_include,clucene,\ + -I$(call gb_UnpackedTarball_get_dir,clucene)/inc/internal \ + -I$(call gb_UnpackedTarball_get_dir,clucene)/src/core \ + -I$(call gb_UnpackedTarball_get_dir,clucene)/src/contribs-lib \ + -I$(call gb_UnpackedTarball_get_dir,clucene)/src/shared \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_set_precompiled_header,clucene,external/clucene/inc/pch/precompiled_clucene)) + +$(eval $(call gb_Library_add_defs,clucene,\ + -Dclucene_shared_EXPORTS \ + -Dclucene_core_EXPORTS \ + -Dclucene_contribs_lib_EXPORTS \ +)) + +# Needed when building against MSVC in C++17 mode, as +# workdir/UnpackedTarball/clucene/src/core/CLucene/util/Equators.h uses std::binary_function: +$(eval $(call gb_Library_add_defs,clucene, \ + -D_HAS_AUTO_PTR_ETC=1 \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_libs,clucene,\ + -lm \ + -ldl \ +)) +endif + +$(eval $(call gb_Library_set_generated_cxx_suffix,clucene,cpp)) + +$(eval $(call gb_Library_add_generated_exception_objects,clucene,\ + UnpackedTarball/clucene/src/shared/CLucene/SharedHeader \ + UnpackedTarball/clucene/src/shared/CLucene/config/gunichartables \ + UnpackedTarball/clucene/src/shared/CLucene/config/repl_tcslwr \ + UnpackedTarball/clucene/src/shared/CLucene/config/repl_tcstoll \ + UnpackedTarball/clucene/src/shared/CLucene/config/repl_tcscasecmp \ + UnpackedTarball/clucene/src/shared/CLucene/config/repl_tprintf \ + UnpackedTarball/clucene/src/shared/CLucene/config/repl_lltot \ + UnpackedTarball/clucene/src/shared/CLucene/config/repl_tcstod \ + UnpackedTarball/clucene/src/shared/CLucene/config/utf8 \ + UnpackedTarball/clucene/src/shared/CLucene/config/threads \ + UnpackedTarball/clucene/src/shared/CLucene/debug/condition \ + UnpackedTarball/clucene/src/shared/CLucene/util/StringBuffer \ + UnpackedTarball/clucene/src/shared/CLucene/util/Misc \ + UnpackedTarball/clucene/src/shared/CLucene/util/dirent \ + UnpackedTarball/clucene/src/core/CLucene/StdHeader \ + UnpackedTarball/clucene/src/core/CLucene/debug/error \ + UnpackedTarball/clucene/src/core/CLucene/util/ThreadLocal \ + UnpackedTarball/clucene/src/core/CLucene/util/Reader \ + UnpackedTarball/clucene/src/core/CLucene/util/Equators \ + UnpackedTarball/clucene/src/core/CLucene/util/FastCharStream \ + UnpackedTarball/clucene/src/core/CLucene/util/MD5Digester \ + UnpackedTarball/clucene/src/core/CLucene/util/StringIntern \ + UnpackedTarball/clucene/src/core/CLucene/util/BitSet \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/FastCharStream \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/MultiFieldQueryParser \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/QueryParser \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/QueryParserTokenManager \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/QueryToken \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/Lexer \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/MultiFieldQueryParser \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/QueryParser \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/QueryParserBase \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/QueryToken \ + UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/TokenList \ + UnpackedTarball/clucene/src/core/CLucene/analysis/standard/StandardAnalyzer \ + UnpackedTarball/clucene/src/core/CLucene/analysis/standard/StandardFilter \ + UnpackedTarball/clucene/src/core/CLucene/analysis/standard/StandardTokenizer \ + UnpackedTarball/clucene/src/core/CLucene/analysis/Analyzers \ + UnpackedTarball/clucene/src/core/CLucene/analysis/AnalysisHeader \ + UnpackedTarball/clucene/src/core/CLucene/store/MMapInput \ + UnpackedTarball/clucene/src/core/CLucene/store/IndexInput \ + UnpackedTarball/clucene/src/core/CLucene/store/Lock \ + UnpackedTarball/clucene/src/core/CLucene/store/LockFactory \ + UnpackedTarball/clucene/src/core/CLucene/store/IndexOutput \ + UnpackedTarball/clucene/src/core/CLucene/store/Directory \ + UnpackedTarball/clucene/src/core/CLucene/store/FSDirectory \ + UnpackedTarball/clucene/src/core/CLucene/store/RAMDirectory \ + UnpackedTarball/clucene/src/core/CLucene/document/Document \ + UnpackedTarball/clucene/src/core/CLucene/document/DateField \ + UnpackedTarball/clucene/src/core/CLucene/document/DateTools \ + UnpackedTarball/clucene/src/core/CLucene/document/Field \ + UnpackedTarball/clucene/src/core/CLucene/document/FieldSelector \ + UnpackedTarball/clucene/src/core/CLucene/document/NumberTools \ + UnpackedTarball/clucene/src/core/CLucene/index/IndexFileNames \ + UnpackedTarball/clucene/src/core/CLucene/index/IndexFileNameFilter \ + UnpackedTarball/clucene/src/core/CLucene/index/IndexDeletionPolicy \ + UnpackedTarball/clucene/src/core/CLucene/index/SegmentMergeInfo \ + UnpackedTarball/clucene/src/core/CLucene/index/SegmentInfos \ + UnpackedTarball/clucene/src/core/CLucene/index/MergeScheduler \ + UnpackedTarball/clucene/src/core/CLucene/index/SegmentTermDocs \ + UnpackedTarball/clucene/src/core/CLucene/index/FieldsWriter \ + UnpackedTarball/clucene/src/core/CLucene/index/TermInfosWriter \ + UnpackedTarball/clucene/src/core/CLucene/index/Term \ + UnpackedTarball/clucene/src/core/CLucene/index/Terms \ + UnpackedTarball/clucene/src/core/CLucene/index/MergePolicy \ + UnpackedTarball/clucene/src/core/CLucene/index/DocumentsWriter \ + UnpackedTarball/clucene/src/core/CLucene/index/DocumentsWriterThreadState \ + UnpackedTarball/clucene/src/core/CLucene/index/SegmentTermVector \ + UnpackedTarball/clucene/src/core/CLucene/index/TermVectorReader \ + UnpackedTarball/clucene/src/core/CLucene/index/FieldInfos \ + UnpackedTarball/clucene/src/core/CLucene/index/CompoundFile \ + UnpackedTarball/clucene/src/core/CLucene/index/SkipListReader \ + UnpackedTarball/clucene/src/core/CLucene/index/SkipListWriter \ + UnpackedTarball/clucene/src/core/CLucene/index/IndexFileDeleter \ + UnpackedTarball/clucene/src/core/CLucene/index/SegmentReader \ + UnpackedTarball/clucene/src/core/CLucene/index/DirectoryIndexReader \ + UnpackedTarball/clucene/src/core/CLucene/index/TermVectorWriter \ + UnpackedTarball/clucene/src/core/CLucene/index/IndexReader \ + UnpackedTarball/clucene/src/core/CLucene/index/SegmentTermPositions \ + UnpackedTarball/clucene/src/core/CLucene/index/SegmentMerger \ + UnpackedTarball/clucene/src/core/CLucene/index/IndexWriter \ + UnpackedTarball/clucene/src/core/CLucene/index/MultiReader \ + UnpackedTarball/clucene/src/core/CLucene/index/MultiSegmentReader \ + UnpackedTarball/clucene/src/core/CLucene/index/Payload \ + UnpackedTarball/clucene/src/core/CLucene/index/SegmentTermEnum \ + UnpackedTarball/clucene/src/core/CLucene/index/TermInfo \ + UnpackedTarball/clucene/src/core/CLucene/index/IndexModifier \ + UnpackedTarball/clucene/src/core/CLucene/index/SegmentMergeQueue \ + UnpackedTarball/clucene/src/core/CLucene/index/FieldsReader \ + UnpackedTarball/clucene/src/core/CLucene/index/TermInfosReader \ + UnpackedTarball/clucene/src/core/CLucene/index/MultipleTermPositions \ + UnpackedTarball/clucene/src/core/CLucene/search/Compare \ + UnpackedTarball/clucene/src/core/CLucene/search/Scorer \ + UnpackedTarball/clucene/src/core/CLucene/search/ScorerDocQueue \ + UnpackedTarball/clucene/src/core/CLucene/search/PhraseScorer \ + UnpackedTarball/clucene/src/core/CLucene/search/SloppyPhraseScorer \ + UnpackedTarball/clucene/src/core/CLucene/search/DisjunctionSumScorer \ + UnpackedTarball/clucene/src/core/CLucene/search/ConjunctionScorer \ + UnpackedTarball/clucene/src/core/CLucene/search/PhraseQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/PrefixQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/ExactPhraseScorer \ + UnpackedTarball/clucene/src/core/CLucene/search/TermScorer \ + UnpackedTarball/clucene/src/core/CLucene/search/Similarity \ + UnpackedTarball/clucene/src/core/CLucene/search/BooleanScorer \ + UnpackedTarball/clucene/src/core/CLucene/search/BooleanScorer2 \ + UnpackedTarball/clucene/src/core/CLucene/search/HitQueue \ + UnpackedTarball/clucene/src/core/CLucene/search/FieldCacheImpl \ + UnpackedTarball/clucene/src/core/CLucene/search/ChainedFilter \ + UnpackedTarball/clucene/src/core/CLucene/search/RangeFilter \ + UnpackedTarball/clucene/src/core/CLucene/search/CachingWrapperFilter \ + UnpackedTarball/clucene/src/core/CLucene/search/QueryFilter \ + UnpackedTarball/clucene/src/core/CLucene/search/TermQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/FuzzyQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/SearchHeader \ + UnpackedTarball/clucene/src/core/CLucene/search/RangeQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/IndexSearcher \ + UnpackedTarball/clucene/src/core/CLucene/search/Sort \ + UnpackedTarball/clucene/src/core/CLucene/search/PhrasePositions \ + UnpackedTarball/clucene/src/core/CLucene/search/FieldDocSortedHitQueue \ + UnpackedTarball/clucene/src/core/CLucene/search/WildcardTermEnum \ + UnpackedTarball/clucene/src/core/CLucene/search/MultiSearcher \ + UnpackedTarball/clucene/src/core/CLucene/search/Hits \ + UnpackedTarball/clucene/src/core/CLucene/search/MultiTermQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/FilteredTermEnum \ + UnpackedTarball/clucene/src/core/CLucene/search/FieldSortedHitQueue \ + UnpackedTarball/clucene/src/core/CLucene/search/WildcardQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/Explanation \ + UnpackedTarball/clucene/src/core/CLucene/search/BooleanQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/FieldCache \ + UnpackedTarball/clucene/src/core/CLucene/search/DateFilter \ + UnpackedTarball/clucene/src/core/CLucene/search/MatchAllDocsQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/MultiPhraseQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/ConstantScoreQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/CachingSpanFilter \ + UnpackedTarball/clucene/src/core/CLucene/search/SpanQueryFilter \ + UnpackedTarball/clucene/src/core/CLucene/search/spans/NearSpansOrdered \ + UnpackedTarball/clucene/src/core/CLucene/search/spans/NearSpansUnordered \ + UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanFirstQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanNearQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanNotQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanOrQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanScorer \ + UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanTermQuery \ + UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanWeight \ + UnpackedTarball/clucene/src/core/CLucene/search/spans/TermSpans \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/analysis/PorterStemmer \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/Snowball \ +)) + +$(eval $(call gb_Library_add_generated_cobjects,clucene,\ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/libstemmer/libstemmer \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/runtime/utilities \ + UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/runtime/api \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/clucene/Makefile b/external/clucene/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/clucene/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/clucene/Module_clucene.mk b/external/clucene/Module_clucene.mk new file mode 100644 index 000000000..aee86111e --- /dev/null +++ b/external/clucene/Module_clucene.mk @@ -0,0 +1,21 @@ +# -*- 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,clucene)) + +# do we need the Android check below? Shouldn't it be already covered by +# gb_Helper_optional in Module_external.mk? +ifneq ($(OS),ANDROID) +$(eval $(call gb_Module_add_targets,clucene,\ + Library_clucene \ + UnpackedTarball_clucene \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/clucene/README b/external/clucene/README new file mode 100644 index 000000000..bedae920f --- /dev/null +++ b/external/clucene/README @@ -0,0 +1,4 @@ +External package containing clucene from [http://clucene.sourceforge.net/]. + +This is used to index our downloadable help packages, and allow them +to be searched efficiently at run-time.
\ No newline at end of file diff --git a/external/clucene/UnpackedTarball_clucene.mk b/external/clucene/UnpackedTarball_clucene.mk new file mode 100644 index 000000000..1dc64a78f --- /dev/null +++ b/external/clucene/UnpackedTarball_clucene.mk @@ -0,0 +1,73 @@ +# -*- 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,clucene)) + +$(eval $(call gb_UnpackedTarball_set_tarball,clucene,$(CLUCENE_TARBALL))) + +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_set_post_action,clucene,\ + mkdir -p inc/internal/CLucene/util && \ + mv src/shared/CLucene/util/dirent.h inc/internal/CLucene/util \ +)) +endif + +$(eval $(call gb_UnpackedTarball_set_patchlevel,clucene,0)) + +# clucene-multimap-put.patch was proposed upstream, see +# http://sourceforge.net/mailarchive/message.php?msg_id=29143260 +# clucene-mutex.patch was proposed upstream, see +# http://sourceforge.net/mailarchive/message.php?msg_id=32314782 +# clucene-asan.patch was proposed upstream, see +# http://sourceforge.net/mailarchive/message.php?msg_id=32367781 +# see msvc14.0 error report on: +# https://connect.microsoft.com/VisualStudio/feedback/details/1424082/vs2015-rc-c-compiler-mixes-up-template-parameter-with-identical-named-inherited-typedef +# ostream-wchar_t.patch was proposed upstream, see +# <https://sourceforge.net/p/clucene/mailman/message/36989348/> +# heap-buffer-overflow.patch was proposed upstream, see +# <https://sourceforge.net/p/clucene/mailman/message/36991067/> +$(eval $(call gb_UnpackedTarball_add_patches,clucene,\ + external/clucene/patches/clucene-debug.patch \ + external/clucene/patches/clucene-multimap-put.patch \ + external/clucene/patches/clucene-narrowing-conversions.patch \ + external/clucene/patches/clucene-nullptr.patch \ + external/clucene/patches/clucene-warnings.patch \ + external/clucene/patches/clucene-aix.patch \ + external/clucene/patches/clucene-git1-win64.patch \ + external/clucene/patches/clucene-ub.patch \ + external/clucene/patches/clucene-mutex.patch \ + external/clucene/patches/clucene-asan.patch \ + external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch \ + external/clucene/patches/ostream-wchar_t.patch \ + external/clucene/patches/heap-buffer-overflow.patch \ +)) + +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,clucene,\ + external/clucene/patches/clucene-libcpp.patch \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-MSVC.h)) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MSVC.h)) +else # ! $(OS),WNT +ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-GCC-atomic.h)) +else +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-generic.h)) +endif +ifeq ($(OS),LINUX) +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-LINUX.h)) +else +$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-generic.h)) +endif +endif # $(OS),WNT + +# vim: set noet sw=4 ts=4: diff --git a/external/clucene/configs/_clucene-config-LINUX.h b/external/clucene/configs/_clucene-config-LINUX.h new file mode 100644 index 000000000..2b425b6b2 --- /dev/null +++ b/external/clucene/configs/_clucene-config-LINUX.h @@ -0,0 +1,114 @@ +#ifndef _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H +#define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1 + +/* src/shared/CLucene/_clucene-config.h. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/_clucene-config-LINUX.h. +* These are internal definitions, and this file does not need to be distributed +*/ + +/* CMake will look for these functions: */ +/* #undef _CL_HAVE_FUNCTION__VSNWPRINTF */ +/* #undef _CL_HAVE_FUNCTION__SNWPRINTF */ +#define _CL_HAVE_FUNCTION_WCSCASECMP +#define _CL_HAVE_FUNCTION_WCSCAT 1 +#define _CL_HAVE_FUNCTION_WCSCHR 1 +#define _CL_HAVE_FUNCTION_WCSCMP 1 +#define _CL_HAVE_FUNCTION_WCSCPY 1 +#define _CL_HAVE_FUNCTION_WCSCSPN 1 +/* #undef _CL_HAVE_FUNCTION_WCSICMP */ +#define _CL_HAVE_FUNCTION_WCSLEN 1 +#define _CL_HAVE_FUNCTION_WCSNCMP 1 +#define _CL_HAVE_FUNCTION_WCSNCPY 1 +#define _CL_HAVE_FUNCTION_WCSSTR 1 +#define _CL_HAVE_FUNCTION_WCSTOD 1 +#define _CL_HAVE_FUNCTION_WCSDUP 1 +#define _CL_HAVE_FUNCTION_WCSTOLL 1 +/* #undef _CL_HAVE_FUNCTION_WCSUPR */ +#define _CL_HAVE_FUNCTION_GETTIMEOFDAY 1 +/* #undef _CL_HAVE_FUNCTION_MAPVIEWOFFILE */ + +/* #undef _CL_HAVE_FUNCTION_LLTOA */ +/* #undef _CL_HAVE_FUNCTION_LLTOW */ +#define _CL_HAVE_FUNCTION_PRINTF 1 +#define _CL_HAVE_FUNCTION_SNPRINTF 1 +#define _CL_HAVE_FUNCTION_MMAP 1 +/* #undef _CL_HAVE_FUNCTION_STRLWR */ +#define _CL_HAVE_FUNCTION_STRTOLL 1 +/* #undef _CL_HAVE_FUNCTION_STRUPR */ +/* #undef _CL_HAVE_FUNCTION_GETPAGESIZE */ +#define _CL_HAVE_FUNCTION_USLEEP 1 +/* #undef _CL_HAVE_FUNCTION_SLEEP */ + +#define CL_MAX_PATH 4096 +//this is the max filename... for now its just the same, +//but this could change, so we use a different name +#define CL_MAX_NAME CL_MAX_PATH +//this used to be CL_MAX_NAME * 32, but as Alex Hudson points out, this could come to be 128kb. +//the above logic for CL_MAX_NAME should be correct enough to handle all file names +#define CL_MAX_DIR CL_MAX_PATH + +#define _O_RANDOM 0 +#define _O_BINARY 0 +#define _S_IREAD S_IREAD +#define _S_IWRITE S_IWRITE +#define _timeb timeb + +#define _ILONG(x) x ## L +#define _ILONGLONG(x) x ## LL + +#define fileStat stat64 +#define cl_stat_t stat64 +#define fileSize CL_NS(util)::Misc::filelength +#define fileSeek lseek64 +#define fileTell(fhandle) fileSeek(fhandle, 0, SEEK_CUR) +#define fileHandleStat fstat64 +#define _realpath realpath +#define _rename rename +#define _close close +#define _read read +#define _cl_open open +#define _write write +#define _snprintf snprintf +#define _mkdir(x) mkdir(x,0777) +#define _unlink unlink +#define _ftime ftime +#define SLEEPFUNCTION usleep + +/* CMake will determine these specifics. Things like bugs, etc */ + +/* Does not support new float byte<->float conversions */ +/* #undef _CL_HAVE_NO_FLOAT_BYTE */ + +/* Define if recursive pthread mutexes are available */ +#define _CL_HAVE_PTHREAD_MUTEX_RECURSIVE 1 + +/** define if you would like to force clucene to use the internal +* character functions. +* Tests may display unpredictable behaviour if this is not defined. +*/ +#ifndef LUCENE_USE_INTERNAL_CHAR_FUNCTIONS + #define LUCENE_USE_INTERNAL_CHAR_FUNCTIONS 1 +#endif + +/** fix ansi for loop scope */ +#if 1==0 + #define for if (0); else for +#endif + + +/* Compiler oddities */ + +//not sure why, but cygwin reports _S_IREAD, but doesn't actually work... +//TODO: make this work properly (this bit shouldn't be necessary) +#ifdef __CYGWIN__ + #define _S_IREAD 0333 + #define _S_IWRITE 0333 +#endif + +#ifdef __BORLANDC__ //borland compiler + #define O_RANDOM 0 +#endif + +#endif diff --git a/external/clucene/configs/_clucene-config-MSVC.h b/external/clucene/configs/_clucene-config-MSVC.h new file mode 100644 index 000000000..09ef41cb6 --- /dev/null +++ b/external/clucene/configs/_clucene-config-MSVC.h @@ -0,0 +1,114 @@ +#ifndef _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H +#define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1 + +/* src/shared/CLucene/_clucene-config.h. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/_clucene-config-MSVC.h. +* These are internal definitions, and this file does not need to be distributed +*/ + +/* CMake will look for these functions: */ +#define _CL_HAVE_FUNCTION__VSNWPRINTF +#define _CL_HAVE_FUNCTION__SNWPRINTF +/* #undef _CL_HAVE_FUNCTION_WCSCASECMP */ +#define _CL_HAVE_FUNCTION_WCSCAT 1 +#define _CL_HAVE_FUNCTION_WCSCHR 1 +#define _CL_HAVE_FUNCTION_WCSCMP 1 +#define _CL_HAVE_FUNCTION_WCSCPY 1 +#define _CL_HAVE_FUNCTION_WCSCSPN 1 +#define _CL_HAVE_FUNCTION_WCSICMP +#define _CL_HAVE_FUNCTION_WCSLEN 1 +#define _CL_HAVE_FUNCTION_WCSNCMP 1 +#define _CL_HAVE_FUNCTION_WCSNCPY 1 +#define _CL_HAVE_FUNCTION_WCSSTR 1 +#define _CL_HAVE_FUNCTION_WCSTOD 1 +#define _CL_HAVE_FUNCTION_WCSDUP 1 +/* #undef _CL_HAVE_FUNCTION_WCSTOLL */ +#define _CL_HAVE_FUNCTION_WCSUPR 1 +/* #undef _CL_HAVE_FUNCTION_GETTIMEOFDAY */ +#define _CL_HAVE_FUNCTION_MAPVIEWOFFILE 1 + +/* #undef _CL_HAVE_FUNCTION_LLTOA */ +/* #undef _CL_HAVE_FUNCTION_LLTOW */ +#define _CL_HAVE_FUNCTION_PRINTF 1 +/* #undef _CL_HAVE_FUNCTION_SNPRINTF */ +/* #undef _CL_HAVE_FUNCTION_MMAP */ +#define _CL_HAVE_FUNCTION_STRLWR 1 +/* #undef _CL_HAVE_FUNCTION_STRTOLL */ +#define _CL_HAVE_FUNCTION_STRUPR 1 +/* #undef _CL_HAVE_FUNCTION_GETPAGESIZE */ +/* #undef _CL_HAVE_FUNCTION_USLEEP */ +#define _CL_HAVE_FUNCTION_SLEEP 1 + +#define CL_MAX_PATH 4096 +//this is the max filename... for now its just the same, +//but this could change, so we use a different name +#define CL_MAX_NAME CL_MAX_PATH +//this used to be CL_MAX_NAME * 32, but as Alex Hudson points out, this could come to be 128kb. +//the above logic for CL_MAX_NAME should be correct enough to handle all file names +#define CL_MAX_DIR CL_MAX_PATH + +/* undef _O_RANDOM _O_RANDOM */ +/* undef _O_BINARY _O_BINARY */ +/* undef _S_IREAD _S_IREAD */ +/* undef _S_IWRITE _S_IWRITE */ +/* #undef _timeb */ + +#define _ILONG(x) x ## L +#define _ILONGLONG(x) x ## LL + +#define fileStat _stati64 +#define cl_stat_t _stati64 +#define fileSize _filelengthi64 +#define fileSeek _lseeki64 +#define fileTell _telli64 +#define fileHandleStat _fstati64 +#define _realpath(rel,abs) ::_fullpath(abs,rel,CL_MAX_PATH) +#define _rename rename +/* undef _close _close */ +/* undef _read _read */ +#define _cl_open _open +/* undef _write _write */ +/* undef _snprintf _snprintf */ +/* undef _mkdir _mkdir */ +/* undef _unlink _unlink */ +/* undef _ftime _ftime */ +#define SLEEPFUNCTION Sleep + +/* CMake will determine these specifics. Things like bugs, etc */ + +/* Does not support new float byte<->float conversions */ +/* #undef _CL_HAVE_NO_FLOAT_BYTE */ + +/* Define if recursive pthread mutexes are available */ +/* #undef _CL_HAVE_PTHREAD_MUTEX_RECURSIVE */ + +/** define if you would like to force clucene to use the internal +* character functions. +* Tests may display unpredictable behaviour if this is not defined. +*/ +#ifndef LUCENE_USE_INTERNAL_CHAR_FUNCTIONS + #define LUCENE_USE_INTERNAL_CHAR_FUNCTIONS 1 +#endif + +/** fix ansi for loop scope */ +#if 1==0 + #define for if (0); else for +#endif + + +/* Compiler oddities */ + +//not sure why, but cygwin reports _S_IREAD, but doesn't actually work... +//TODO: make this work properly (this bit shouldn't be necessary) +#ifdef __CYGWIN__ + #define _S_IREAD 0333 + #define _S_IWRITE 0333 +#endif + +#ifdef __BORLANDC__ //borland compiler + #define O_RANDOM 0 +#endif + +#endif diff --git a/external/clucene/configs/_clucene-config-generic.h b/external/clucene/configs/_clucene-config-generic.h new file mode 100644 index 000000000..42cf27c7f --- /dev/null +++ b/external/clucene/configs/_clucene-config-generic.h @@ -0,0 +1,114 @@ +#ifndef _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H +#define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1 + +/* src/shared/CLucene/_clucene-config.h. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/_clucene-config-generic.h. +* These are internal definitions, and this file does not need to be distributed +*/ + +/* CMake will look for these functions: */ +/* #undef _CL_HAVE_FUNCTION__VSNWPRINTF */ +/* #undef _CL_HAVE_FUNCTION__SNWPRINTF */ +#define _CL_HAVE_FUNCTION_WCSCASECMP +#define _CL_HAVE_FUNCTION_WCSCAT 1 +#define _CL_HAVE_FUNCTION_WCSCHR 1 +#define _CL_HAVE_FUNCTION_WCSCMP 1 +#define _CL_HAVE_FUNCTION_WCSCPY 1 +#define _CL_HAVE_FUNCTION_WCSCSPN 1 +/* #undef _CL_HAVE_FUNCTION_WCSICMP */ +#define _CL_HAVE_FUNCTION_WCSLEN 1 +#define _CL_HAVE_FUNCTION_WCSNCMP 1 +#define _CL_HAVE_FUNCTION_WCSNCPY 1 +#define _CL_HAVE_FUNCTION_WCSSTR 1 +#define _CL_HAVE_FUNCTION_WCSTOD 1 +/* #undef _CL_HAVE_FUNCTION_WCSDUP 1 */ +#define _CL_HAVE_FUNCTION_WCSTOLL 1 +/* #undef _CL_HAVE_FUNCTION_WCSUPR */ +#define _CL_HAVE_FUNCTION_GETTIMEOFDAY 1 +/* #undef _CL_HAVE_FUNCTION_MAPVIEWOFFILE */ + +/* #undef _CL_HAVE_FUNCTION_LLTOA */ +/* #undef _CL_HAVE_FUNCTION_LLTOW */ +#define _CL_HAVE_FUNCTION_PRINTF 1 +#define _CL_HAVE_FUNCTION_SNPRINTF 1 +#define _CL_HAVE_FUNCTION_MMAP 1 +/* #undef _CL_HAVE_FUNCTION_STRLWR */ +#define _CL_HAVE_FUNCTION_STRTOLL 1 +/* #undef _CL_HAVE_FUNCTION_STRUPR */ +/* #undef _CL_HAVE_FUNCTION_GETPAGESIZE */ +#define _CL_HAVE_FUNCTION_USLEEP 1 +/* #undef _CL_HAVE_FUNCTION_SLEEP */ + +#define CL_MAX_PATH 4096 +//this is the max filename... for now its just the same, +//but this could change, so we use a different name +#define CL_MAX_NAME CL_MAX_PATH +//this used to be CL_MAX_NAME * 32, but as Alex Hudson points out, this could come to be 128kb. +//the above logic for CL_MAX_NAME should be correct enough to handle all file names +#define CL_MAX_DIR CL_MAX_PATH + +#define _O_RANDOM 0 +#define _O_BINARY 0 +#define _S_IREAD S_IREAD +#define _S_IWRITE S_IWRITE +#define _timeb timeb + +#define _ILONG(x) x ## L +#define _ILONGLONG(x) x ## LL + +#define fileStat stat +#define cl_stat_t stat +#define fileSize CL_NS(util)::Misc::filelength +#define fileSeek lseek +#define fileTell(fhandle) fileSeek(fhandle, 0, SEEK_CUR) +#define fileHandleStat fstat +#define _realpath realpath +#define _rename rename +#define _close close +#define _read read +#define _cl_open open +#define _write write +#define _snprintf snprintf +#define _mkdir(x) mkdir(x,0777) +#define _unlink unlink +#define _ftime ftime +#define SLEEPFUNCTION usleep + +/* CMake will determine these specifics. Things like bugs, etc */ + +/* Does not support new float byte<->float conversions */ +/* #undef _CL_HAVE_NO_FLOAT_BYTE */ + +/* Define if recursive pthread mutexes are available */ +#define _CL_HAVE_PTHREAD_MUTEX_RECURSIVE 1 + +/** define if you would like to force clucene to use the internal +* character functions. +* Tests may display unpredictable behaviour if this is not defined. +*/ +#ifndef LUCENE_USE_INTERNAL_CHAR_FUNCTIONS + #define LUCENE_USE_INTERNAL_CHAR_FUNCTIONS 1 +#endif + +/** fix ansi for loop scope */ +#if 1==0 + #define for if (0); else for +#endif + + +/* Compiler oddities */ + +//not sure why, but cygwin reports _S_IREAD, but doesn't actually work... +//TODO: make this work properly (this bit shouldn't be necessary) +#ifdef __CYGWIN__ + #define _S_IREAD 0333 + #define _S_IWRITE 0333 +#endif + +#ifdef __BORLANDC__ //borland compiler + #define O_RANDOM 0 +#endif + +#endif diff --git a/external/clucene/configs/clucene-config-GCC-atomic.h b/external/clucene/configs/clucene-config-GCC-atomic.h new file mode 100644 index 000000000..3c034a1da --- /dev/null +++ b/external/clucene/configs/clucene-config-GCC-atomic.h @@ -0,0 +1,150 @@ +#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H +#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 + +/* src/shared/CLucene/clucene-config.h. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/clucene-config-GCC-atomic.h. +*/ + +/* CMake will look for these headers: */ +#define _CL_HAVE_STRING_H 1 +#define _CL_HAVE_MEMORY_H 1 +#define _CL_HAVE_UNISTD_H 1 +/* #undef _CL_HAVE_IO_H */ +/* #undef _CL_HAVE_DIRECT_H */ +#define _CL_HAVE_DIRENT_H 1 +#define _CL_HAVE_SYS_DIR_H +/* #undef _CL_HAVE_SYS_NDIR_H */ +#define _CL_HAVE_ERRNO_H 1 +#define _CL_HAVE_WCHAR_H 1 +#define _CL_HAVE_WCTYPE_H +#define _CL_HAVE_CTYPE_H 1 +/* #undef _CL_HAVE_WINDOWS_H */ +/* #undef _CL_HAVE_WINDEF_H */ +#define _CL_HAVE_SYS_TYPES_H 1 +/* #undef _CL_HAVE_DLFCN_H */ +#define _CL_HAVE_EXT_HASH_MAP 1 +/* #undef _CL_HAVE_EXT_HASH_SET */ +#define _CL_HAVE_TR1_UNORDERED_MAP 1 +#define _CL_HAVE_TR1_UNORDERED_SET 1 +#define _CL_HAVE_HASH_MAP +#define _CL_HAVE_HASH_SET +/* #undef _CL_HAVE_NDIR_H */ +#define _CL_HAVE_SYS_STAT_H 1 +#define _CL_HAVE_SYS_TIMEB_H 1 +#define _CL_HAVE_SYS_TIME_H 1 +/* #undef _CL_HAVE_TCHAR_H */ +#define _CL_HAVE_SYS_MMAN_H 1 +/* #undef _CL_HAVE_WINERROR_H */ +#define _CL_HAVE_STDINT_H 1 + +// our needed types +/* undef int8_t int8_t */ +/* undef uint8_t uint8_t */ +/* undef int16_t int16_t */ +/* undef uint16_t uint16_t */ +/* undef int32_t int32_t */ +/* undef uint32_t uint32_t */ +/* undef int64_t int64_t */ +/* undef uint64_t uint64_t */ + +/* undef float_t*/ + +/* undef size_t size_t */ + +/* tchar & _T definitions... */ +typedef wchar_t TCHAR; +#define _T(x) L ## x + +/* CMake will determine these specifics. Things like bugs, etc */ + +/* if we can't support the map/set hashing */ +/* #undef LUCENE_DISABLE_HASHING */ + +/* Define if you have POSIX threads libraries and header files. */ +#define _CL_HAVE_PTHREAD 1 + +/* Define if you have Win32 threads libraries and header files. */ +/* #undef _CL_HAVE_WIN32_THREADS */ + +/* Define if we have gcc atomic functions */ +#define _CL_HAVE_GCC_ATOMIC_FUNCTIONS 1 + +/* Define what eval method is required for float_t to be defined (for GCC). */ +/* #undef _FLT_EVAL_METHOD */ + +/* If we use hashmaps, which namespace do we use: */ +#define CL_NS_HASHING(func) std::tr1::func +/* If we use hashmaps, which classes do we use: */ +#define _CL_HASH_MAP unordered_map +#define _CL_HASH_SET unordered_set + +/* define if the compiler implements namespaces */ +#define _CL_HAVE_NAMESPACES + +/* Defined if the snprintf overflow test fails */ +/* #undef _CL_HAVE_SNPRINTF_BUG */ + +/* Defined if the swprintf test fails */ +/* #undef _CL_HAVE_SNWPRINTF_BUG */ + +/* How to define a static const in a class */ +#define LUCENE_STATIC_CONSTANT(type, assignment) static const type assignment + +/* Define to the necessary symbol if this constant uses a non-standard name on + your system. */ +//todo: not checked +/* #undef _CL_PTHREAD_CREATE_JOINABLE */ + +/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ +//todo: not being checked for... +/* #undef _CL_STAT_MACROS_BROKEN */ + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +//not actually used for anything... +//#define _CL_TIME_WITH_SYS_TIME 1 + +/* Define that we will be using -fvisibility=hidden, and + * make public classes visible using __attribute__ ((visibility("default"))) + */ +#define _CL_HAVE_GCCVISIBILITYPATCH 1 + + +/* Versions, etc */ + +/* Name of package */ +#define _CL_PACKAGE "clucene-core" + +/* Version number of package */ +#define _CL_VERSION "2.3.3.4" + +/* So-Version number of package */ +#define _CL_SOVERSION "1" + +/* A comparable version number */ +#define _CL_INT_VERSION 2030304 + +/* Configured options (from command line) */ + +/* Forces into Ascii mode */ +/* #undef _ASCII */ + +/* Conditional Debugging */ +/* #undef _CL__CND_DEBUG */ + +/* debuging option */ +/* #undef _DEBUG */ + +/* Disable multithreading */ +/* #undef _CL_DISABLE_MULTITHREADING */ + + +#ifdef __BORLANDC__ //borland compiler + //todo: bcc incorrectly detects this... fix this in cmake + #undef LUCENE_STATIC_CONSTANT + #define LUCENE_STATIC_CONSTANT(type, assignment) enum { assignment } +#endif + + +#endif diff --git a/external/clucene/configs/clucene-config-MSVC.h b/external/clucene/configs/clucene-config-MSVC.h new file mode 100644 index 000000000..5e22e7a7e --- /dev/null +++ b/external/clucene/configs/clucene-config-MSVC.h @@ -0,0 +1,149 @@ +#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H +#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 + +/* src/shared/CLucene/clucene-config.h. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/clucene-config-MSVC.h. +*/ + +/* CMake will look for these headers: */ +#define _CL_HAVE_STRING_H 1 +#define _CL_HAVE_MEMORY_H 1 +/* #undef _CL_HAVE_UNISTD_H */ +#define _CL_HAVE_IO_H 1 +#define _CL_HAVE_DIRECT_H 1 +/* #undef _CL_HAVE_DIRENT_H */ +/* #undef _CL_HAVE_SYS_DIR_H */ +/* #undef _CL_HAVE_SYS_NDIR_H */ +#define _CL_HAVE_ERRNO_H 1 +#define _CL_HAVE_WCHAR_H 1 +#define _CL_HAVE_WCTYPE_H +#define _CL_HAVE_CTYPE_H 1 +#define _CL_HAVE_WINDOWS_H 1 +/* #undef _CL_HAVE_WINDEF_H */ +#define _CL_HAVE_SYS_TYPES_H 1 +/* #undef _CL_HAVE_DLFCN_H */ +/* #undef _CL_HAVE_EXT_HASH_MAP */ +/* #undef _CL_HAVE_EXT_HASH_SET */ +/* #undef _CL_HAVE_TR1_UNORDERED_MAP */ +/* #undef _CL_HAVE_TR1_UNORDERED_SET */ +/* #undef _CL_HAVE_HASH_MAP */ +/* #undef _CL_HAVE_HASH_SET */ +/* #undef _CL_HAVE_NDIR_H */ +#define _CL_HAVE_SYS_STAT_H 1 +#define _CL_HAVE_SYS_TIMEB_H 1 +/* #undef _CL_HAVE_SYS_TIME_H */ +#define _CL_HAVE_TCHAR_H 1 +/* #undef _CL_HAVE_SYS_MMAN_H */ +#define _CL_HAVE_WINERROR_H 1 +/* #undef _CL_HAVE_STDINT_H */ + +// our needed types +typedef signed char int8_t; +typedef unsigned char uint8_t; +typedef signed short int16_t; +typedef unsigned short uint16_t; +typedef signed int int32_t; +typedef unsigned int uint32_t; +typedef signed long long int64_t; +typedef unsigned long long uint64_t; + +typedef unsigned long _cl_dword_t; +/* undef size_t size_t */ + +/* tchar & _T definitions... */ +/* undef TCHAR TCHAR */ +/* #undef _T */ + +/* CMake will determine these specifics. Things like bugs, etc */ + +/* if we can't support the map/set hashing */ +/* #undef LUCENE_DISABLE_HASHING */ + +/* Define if you have POSIX threads libraries and header files. */ +/* #undef _CL_HAVE_PTHREAD */ + +/* Define if you have Win32 threads libraries and header files. */ +#define _CL_HAVE_WIN32_THREADS 1 + +/* Define if we have gcc atomic functions */ +/* #undef _CL_HAVE_GCC_ATOMIC_FUNCTIONS */ + +/* Define what eval method is required for float_t to be defined (for GCC). */ +/* #undef _FLT_EVAL_METHOD */ + +/* If we use hashmaps, which namespace do we use: */ +#define CL_NS_HASHING(func) +/* If we use hashmaps, which classes do we use: */ +#define _CL_HASH_MAP +#define _CL_HASH_SET + +/* define if the compiler implements namespaces */ +#define _CL_HAVE_NAMESPACES + +/* Defined if the snprintf overflow test fails */ +/* #undef _CL_HAVE_SNPRINTF_BUG */ + +/* Defined if the swprintf test fails */ +/* #undef _CL_HAVE_SNWPRINTF_BUG */ + +/* How to define a static const in a class */ +#define LUCENE_STATIC_CONSTANT(type, assignment) static const type assignment + +/* Define to the necessary symbol if this constant uses a non-standard name on + your system. */ +//todo: not checked +/* #undef _CL_PTHREAD_CREATE_JOINABLE */ + +/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ +//todo: not being checked for... +/* #undef _CL_STAT_MACROS_BROKEN */ + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +//not actually used for anything... +/* #undef _CL_TIME_WITH_SYS_TIME */ + +/* Define that we will be using -fvisibility=hidden, and + * make public classes visible using __attribute__ ((visibility("default"))) + */ +/* #undef _CL_HAVE_GCCVISIBILITYPATCH */ + + +/* Versions, etc */ + +/* Name of package */ +#define _CL_PACKAGE "clucene-core" + +/* Version number of package */ +#define _CL_VERSION "2.3.3.4" + +/* So-Version number of package */ +#define _CL_SOVERSION "1" + +/* A comparable version number */ +#define _CL_INT_VERSION 2030304 + +/* Configured options (from command line) */ + +/* Forces into Ascii mode */ +/* #undef _ASCII */ + +/* Conditional Debugging */ +/* #undef _CL__CND_DEBUG */ + +/* debuging option */ +/* #undef _DEBUG */ + +/* Disable multithreading */ +/* #undef _CL_DISABLE_MULTITHREADING */ + + +#ifdef __BORLANDC__ //borland compiler + //todo: bcc incorrectly detects this... fix this in cmake + #undef LUCENE_STATIC_CONSTANT + #define LUCENE_STATIC_CONSTANT(type, assignment) enum { assignment } +#endif + + +#endif diff --git a/external/clucene/configs/clucene-config-generic.h b/external/clucene/configs/clucene-config-generic.h new file mode 100644 index 000000000..b84dd4bc0 --- /dev/null +++ b/external/clucene/configs/clucene-config-generic.h @@ -0,0 +1,150 @@ +#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H +#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 + +/* src/shared/CLucene/clucene-config.h. +* Normally generated automatically at end of cmake, +* but here in LibreOffice this actually is a copy of +* clucene/configs/clucene-config-generic.h. +*/ + +/* CMake will look for these headers: */ +#define _CL_HAVE_STRING_H 1 +#define _CL_HAVE_MEMORY_H 1 +#define _CL_HAVE_UNISTD_H 1 +/* #undef _CL_HAVE_IO_H */ +/* #undef _CL_HAVE_DIRECT_H */ +#define _CL_HAVE_DIRENT_H 1 +#define _CL_HAVE_SYS_DIR_H +/* #undef _CL_HAVE_SYS_NDIR_H */ +#define _CL_HAVE_ERRNO_H 1 +#define _CL_HAVE_WCHAR_H 1 +#define _CL_HAVE_WCTYPE_H +#define _CL_HAVE_CTYPE_H 1 +/* #undef _CL_HAVE_WINDOWS_H */ +/* #undef _CL_HAVE_WINDEF_H */ +#define _CL_HAVE_SYS_TYPES_H 1 +/* #undef _CL_HAVE_DLFCN_H */ +#define _CL_HAVE_EXT_HASH_MAP 1 +/* #undef _CL_HAVE_EXT_HASH_SET */ +#define _CL_HAVE_TR1_UNORDERED_MAP 1 +#define _CL_HAVE_TR1_UNORDERED_SET 1 +#define _CL_HAVE_HASH_MAP +#define _CL_HAVE_HASH_SET +/* #undef _CL_HAVE_NDIR_H */ +#define _CL_HAVE_SYS_STAT_H 1 +#define _CL_HAVE_SYS_TIMEB_H 1 +#define _CL_HAVE_SYS_TIME_H 1 +/* #undef _CL_HAVE_TCHAR_H */ +#define _CL_HAVE_SYS_MMAN_H 1 +/* #undef _CL_HAVE_WINERROR_H */ +#define _CL_HAVE_STDINT_H 1 + +// our needed types +/* undef int8_t int8_t */ +/* undef uint8_t uint8_t */ +/* undef int16_t int16_t */ +/* undef uint16_t uint16_t */ +/* undef int32_t int32_t */ +/* undef uint32_t uint32_t */ +/* undef int64_t int64_t */ +/* undef uint64_t uint64_t */ + +/* undef float_t*/ + +/* undef size_t size_t */ + +/* tchar & _T definitions... */ +typedef wchar_t TCHAR; +#define _T(x) L ## x + +/* CMake will determine these specifics. Things like bugs, etc */ + +/* if we can't support the map/set hashing */ +/* #undef LUCENE_DISABLE_HASHING */ + +/* Define if you have POSIX threads libraries and header files. */ +#define _CL_HAVE_PTHREAD 1 + +/* Define if you have Win32 threads libraries and header files. */ +/* #undef _CL_HAVE_WIN32_THREADS */ + +/* Define if we have gcc atomic functions */ +/* #undef _CL_HAVE_GCC_ATOMIC_FUNCTIONS */ + +/* Define what eval method is required for float_t to be defined (for GCC). */ +/* #undef _FLT_EVAL_METHOD */ + +/* If we use hashmaps, which namespace do we use: */ +#define CL_NS_HASHING(func) std::tr1::func +/* If we use hashmaps, which classes do we use: */ +#define _CL_HASH_MAP unordered_map +#define _CL_HASH_SET unordered_set + +/* define if the compiler implements namespaces */ +#define _CL_HAVE_NAMESPACES + +/* Defined if the snprintf overflow test fails */ +/* #undef _CL_HAVE_SNPRINTF_BUG */ + +/* Defined if the swprintf test fails */ +/* #undef _CL_HAVE_SNWPRINTF_BUG */ + +/* How to define a static const in a class */ +#define LUCENE_STATIC_CONSTANT(type, assignment) static const type assignment + +/* Define to the necessary symbol if this constant uses a non-standard name on + your system. */ +//todo: not checked +/* #undef _CL_PTHREAD_CREATE_JOINABLE */ + +/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ +//todo: not being checked for... +/* #undef _CL_STAT_MACROS_BROKEN */ + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +//not actually used for anything... +//#define _CL_TIME_WITH_SYS_TIME 1 + +/* Define that we will be using -fvisibility=hidden, and + * make public classes visible using __attribute__ ((visibility("default"))) + */ +#define _CL_HAVE_GCCVISIBILITYPATCH 1 + + +/* Versions, etc */ + +/* Name of package */ +#define _CL_PACKAGE "clucene-core" + +/* Version number of package */ +#define _CL_VERSION "2.3.3.4" + +/* So-Version number of package */ +#define _CL_SOVERSION "1" + +/* A comparable version number */ +#define _CL_INT_VERSION 2030304 + +/* Configured options (from command line) */ + +/* Forces into Ascii mode */ +/* #undef _ASCII */ + +/* Conditional Debugging */ +/* #undef _CL__CND_DEBUG */ + +/* debuging option */ +/* #undef _DEBUG */ + +/* Disable multithreading */ +/* #undef _CL_DISABLE_MULTITHREADING */ + + +#ifdef __BORLANDC__ //borland compiler + //todo: bcc incorrectly detects this... fix this in cmake + #undef LUCENE_STATIC_CONSTANT + #define LUCENE_STATIC_CONSTANT(type, assignment) enum { assignment } +#endif + + +#endif diff --git a/external/clucene/inc/pch/precompiled_clucene.cxx b/external/clucene/inc/pch/precompiled_clucene.cxx new file mode 100644 index 000000000..98e81ca8e --- /dev/null +++ b/external/clucene/inc/pch/precompiled_clucene.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_clucene.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/clucene/inc/pch/precompiled_clucene.hxx b/external/clucene/inc/pch/precompiled_clucene.hxx new file mode 100644 index 000000000..f68f71e87 --- /dev/null +++ b/external/clucene/inc/pch/precompiled_clucene.hxx @@ -0,0 +1,108 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2019-10-13 10:16:55 using: + ./bin/update_pch external/clucene clucene --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/clucene/inc/pch/precompiled_clucene.hxx "make external/clucene.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <algorithm> +#include <assert.h> +#include <cctype> +#include <climits> +#include <errno.h> +#include <fcntl.h> +#include <iostream> +#include <limits.h> +#include <map> +#include <sstream> +#include <zlib.h> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <CLucene/_ApiHeader.h> +#include <CLucene/_SharedHeader.h> +#include <CLucene/analysis/AnalysisHeader.h> +#include <CLucene/analysis/Analyzers.h> +#include <CLucene/analysis/cjk/CJKAnalyzer.h> +#include <CLucene/analysis/standard/StandardFilter.h> +#include <CLucene/analysis/standard/StandardTokenizer.h> +#include <CLucene/document/DateField.h> +#include <CLucene/document/DateTools.h> +#include <CLucene/document/Document.h> +#include <CLucene/document/Field.h> +#include <CLucene/document/FieldSelector.h> +#include <CLucene/index/IndexReader.h> +#include <CLucene/index/IndexWriter.h> +#include <CLucene/index/MergePolicy.h> +#include <CLucene/index/MultipleTermPositions.h> +#include <CLucene/index/Term.h> +#include <CLucene/index/TermVector.h> +#include <CLucene/index/Terms.h> +#include <CLucene/index/_IndexFileNameFilter.h> +#include <CLucene/index/_IndexFileNames.h> +#include <CLucene/index/_Term.h> +#include <CLucene/search/BooleanClause.h> +#include <CLucene/search/BooleanQuery.h> +#include <CLucene/search/ConstantScoreQuery.h> +#include <CLucene/search/Explanation.h> +#include <CLucene/search/FieldCache.h> +#include <CLucene/search/FieldSortedHitQueue.h> +#include <CLucene/search/FuzzyQuery.h> +#include <CLucene/search/IndexSearcher.h> +#include <CLucene/search/MatchAllDocsQuery.h> +#include <CLucene/search/MultiPhraseQuery.h> +#include <CLucene/search/PhraseQuery.h> +#include <CLucene/search/PrefixQuery.h> +#include <CLucene/search/Query.h> +#include <CLucene/search/RangeQuery.h> +#include <CLucene/search/Scorer.h> +#include <CLucene/search/SearchHeader.h> +#include <CLucene/search/Similarity.h> +#include <CLucene/search/Sort.h> +#include <CLucene/search/TermQuery.h> +#include <CLucene/search/WildcardQuery.h> +#include <CLucene/search/spans/Spans.h> +#include <CLucene/snowball/SnowballFilter.h> +#include <CLucene/store/Directory.h> +#include <CLucene/store/FSDirectory.h> +#include <CLucene/store/IndexInput.h> +#include <CLucene/store/IndexOutput.h> +#include <CLucene/store/Lock.h> +#include <CLucene/store/LockFactory.h> +#include <CLucene/store/_Lock.h> +#include <CLucene/store/_RAMDirectory.h> +#include <CLucene/util/Array.h> +#include <CLucene/util/BitSet.h> +#include <CLucene/util/CLStreams.h> +#include <CLucene/util/Misc.h> +#include <CLucene/util/PriorityQueue.h> +#include <CLucene/util/StringBuffer.h> +#include <CLucene/util/VoidList.h> +#include <CLucene/util/_Arrays.h> +#include <CLucene/util/_FastCharStream.h> +#include <CLucene/util/_MD5Digester.h> +#include <CLucene/util/_StringIntern.h> +#include <CLucene/util/_ThreadLocal.h> +#include <CLucene/util/dirent.h> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/clucene/patches/clucene-aix.patch b/external/clucene/patches/clucene-aix.patch new file mode 100644 index 000000000..2b796fa45 --- /dev/null +++ b/external/clucene/patches/clucene-aix.patch @@ -0,0 +1,40 @@ +diff -rc clucene.orig/src/core/CLucene/store/MMapInput.cpp clucene/src/core/CLucene/store/MMapInput.cpp +*** src/core/CLucene/store/MMapInput.cpp Wed Apr 10 10:57:37 2013 +--- src/core/CLucene/store/MMapInput.cpp Wed Apr 10 10:58:30 2013 +*************** +*** 115,121 **** + { + } + +! bool MMapIndexInput::open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize ) { + + //Func - Constructor. + // Opens the file named path +--- 115,121 ---- + { + } + +! bool MMapIndexInput::Open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize ) { + + //Func - Constructor. + // Opens the file named path +diff -rc clucene.orig/src/core/CLucene/store/_MMapIndexInput.h clucene/src/core/CLucene/store/_MMapIndexInput.h +*** src/core/CLucene/store/_MMapIndexInput.h Wed Apr 10 10:57:37 2013 +--- src/core/CLucene/store/_MMapIndexInput.h Wed Apr 10 10:58:53 2013 +*************** +*** 18,24 **** + MMapIndexInput(const MMapIndexInput& clone); + MMapIndexInput(Internal* _internal); + public: +! static bool open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize); + + ~MMapIndexInput(); + IndexInput* clone() const; +--- 18,24 ---- + MMapIndexInput(const MMapIndexInput& clone); + MMapIndexInput(Internal* _internal); + public: +! static bool Open(const char* path, IndexInput*& ret, CLuceneError& error, int32_t __bufferSize); + + ~MMapIndexInput(); + IndexInput* clone() const; diff --git a/external/clucene/patches/clucene-asan.patch b/external/clucene/patches/clucene-asan.patch new file mode 100644 index 000000000..51adfad4a --- /dev/null +++ b/external/clucene/patches/clucene-asan.patch @@ -0,0 +1,26 @@ +--- src/core/CLucene/index/IndexWriter.cpp ++++ src/core/CLucene/index/IndexWriter.cpp +@@ -53,7 +53,6 @@ + + DEFINE_MUTEX(IndexWriter::MESSAGE_ID_LOCK) + int32_t IndexWriter::MESSAGE_ID = 0; +-const int32_t IndexWriter::MAX_TERM_LENGTH = DocumentsWriter::MAX_TERM_LENGTH; + + class IndexWriter::Internal{ + public: +--- src/core/CLucene/index/IndexWriter.h ++++ src/core/CLucene/index/IndexWriter.h +@@ -384,13 +384,6 @@ + */ + static const int32_t DEFAULT_MAX_MERGE_DOCS; + +- /** +- * Absolute hard maximum length for a term. If a term +- * arrives from the analyzer longer than this length, it +- * is skipped and a message is printed to infoStream, if +- * set (see {@link #setInfoStream}). +- */ +- static const int32_t MAX_TERM_LENGTH; + + + /* Determines how often segment indices are merged by addDocument(). With diff --git a/external/clucene/patches/clucene-debug.patch b/external/clucene/patches/clucene-debug.patch new file mode 100644 index 000000000..640454e2f --- /dev/null +++ b/external/clucene/patches/clucene-debug.patch @@ -0,0 +1,11 @@ +--- src/core/CLucene/index/TermInfosReader.cpp ++++ src/core/CLucene/index/TermInfosReader.cpp +@@ -111,7 +111,7 @@ + //destroy their elements + #ifdef _DEBUG + for ( int32_t i=0; i<indexTermsLength;++i ){ +- indexTerms[i].__cl_refcount--; ++ indexTerms[i].__cl_decref(); + } + #endif + //Delete the arrays diff --git a/external/clucene/patches/clucene-git1-win64.patch b/external/clucene/patches/clucene-git1-win64.patch new file mode 100644 index 000000000..dc07d380b --- /dev/null +++ b/external/clucene/patches/clucene-git1-win64.patch @@ -0,0 +1,45 @@ +--- src/shared/CLucene/config/threads.cpp 2013-06-06 16:25:23.014622397 +0200 ++++ src/shared/CLucene/config/threads.cpp 2013-06-06 16:33:35.326048842 +0200 +@@ -63,14 +63,14 @@ + } + + int32_t mutex_thread::atomic_increment(_LUCENE_ATOMIC_INT *theInteger){ +-#ifdef _M_X64 ++#ifdef _WIN64 + return _InterlockedIncrement64(theInteger); + #else + return InterlockedIncrement(theInteger); + #endif + } + int32_t mutex_thread::atomic_decrement(_LUCENE_ATOMIC_INT *theInteger){ +-#ifdef _M_X64 ++#ifdef _WIN64 + return _InterlockedDecrement64(theInteger); + #else + return InterlockedDecrement(theInteger); +--- src/shared/CLucene/config/_threads.h 2013-06-06 16:25:23.013622420 +0200 ++++ src/shared/CLucene/config/_threads.h 2013-06-06 16:29:39.152601408 +0200 +@@ -34,9 +34,9 @@ + + __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(); + +-#ifdef _M_X64 +- __declspec(dllimport) long long __stdcall _InterlockedIncrement64(__inout long long volatile*); +- __declspec(dllimport) long long __stdcall _InterlockedDecrement64(__inout long long volatile*); ++#ifdef _WIN64 ++ long long __stdcall _InterlockedIncrement64(long long volatile*); ++ long long __stdcall _InterlockedDecrement64(long long volatile*); + #else + __declspec(dllimport) long __stdcall InterlockedIncrement(long volatile*); + __declspec(dllimport) long __stdcall InterlockedDecrement(long volatile*); +--- src/shared/CLucene/LuceneThreads.h 2013-06-06 16:25:23.014622397 +0200 ++++ src/shared/CLucene/LuceneThreads.h 2013-06-06 16:37:45.490166481 +0200 +@@ -101,7 +101,7 @@ + + #define _LUCENE_ATOMIC_INC(theInteger) CL_NS(util)::mutex_thread::atomic_increment(theInteger) + #define _LUCENE_ATOMIC_DEC(theInteger) CL_NS(util)::mutex_thread::atomic_decrement(theInteger) +-#ifdef _M_X64 ++#ifdef _WIN64 + #define _LUCENE_ATOMIC_INT long long + #else + #define _LUCENE_ATOMIC_INT long diff --git a/external/clucene/patches/clucene-libcpp.patch b/external/clucene/patches/clucene-libcpp.patch new file mode 100644 index 000000000..35235212c --- /dev/null +++ b/external/clucene/patches/clucene-libcpp.patch @@ -0,0 +1,42 @@ +--- src/shared/CLucene/LuceneThreads.h ++++ src/shared/CLucene/LuceneThreads.h +@@ -7,6 +7,7 @@ + #ifndef _LuceneThreads_h + #define _LuceneThreads_h + ++#include "CLucene/config/_threads.h" + + CL_NS_DEF(util) + class CLuceneThreadIdCompare; +--- src/core/CLucene/util/VoidMap.h ++++ src/core/CLucene/util/VoidMap.h +@@ -11,8 +11,13 @@ + #include "CLucene/LuceneThreads.h" + + #if defined(_CL_HAVE_TR1_UNORDERED_MAP) && defined(_CL_HAVE_TR1_UNORDERED_SET) ++#ifdef _LIBCPP_VERSION ++ #include <unordered_map> ++ #include <unordered_set> ++#else + #include <tr1/unordered_map> + #include <tr1/unordered_set> ++#endif + #elif defined(_CL_HAVE_HASH_MAP) && defined(_CL_HAVE_HASH_SET) + //hashing is all or nothing! + #include <hash_map> +--- src/shared/CLucene/config/repl_tchar.h ++++ src/shared/CLucene/config/repl_tchar.h +@@ -36,8 +36,13 @@ + #define _tcsncpy wcsncpy //copy a specified amount of one string to another string. + #define _tcscat wcscat //copy a string onto the end of the other string + #define _tcsncat wcsncat ++#if defined(_LIBCPP_VERSION) && defined(__APPLE__) ++ #define _tcschr ::wcschr //find location of one character ++ #define _tcsstr ::wcsstr //find location of a string ++#else + #define _tcschr wcschr //find location of one character + #define _tcsstr wcsstr //find location of a string ++#endif + #define _tcslen wcslen //get length of a string + #define _tcscmp wcscmp //case sensitive compare two strings + #define _tcsncmp wcsncmp //case sensitive compare two strings diff --git a/external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch b/external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch new file mode 100644 index 000000000..0c9cd0a1f --- /dev/null +++ b/external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch @@ -0,0 +1,53 @@ +diff -ru clucene.org/src/core/CLucene/util/VoidMap.h clucene/src/core/CLucene/util/VoidMap.h +--- src/core/CLucene/util/VoidMap.h 2015-07-24 20:11:28.892997236 +0200 ++++ src/core/CLucene/util/VoidMap.h 2015-07-24 20:21:17.290990623 +0200 +@@ -154,16 +154,16 @@ + + //a CLSet with CLHashMap traits + template<typename _kt, typename _vt, +- typename _Compare, ++ typename Compare, + typename _EqualDummy, + typename _KeyDeletor=CL_NS(util)::Deletor::Dummy, + typename _ValueDeletor=CL_NS(util)::Deletor::Dummy> + class CLUCENE_INLINE_EXPORT CLHashMap:public __CLMap<_kt,_vt, +- CL_NS_STD(map)<_kt,_vt, _Compare>, ++ CL_NS_STD(map)<_kt,_vt, Compare>, + _KeyDeletor,_ValueDeletor> + { +- typedef typename CL_NS_STD(map)<_kt,_vt,_Compare> _base; +- typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, _Compare>, ++ typedef typename CL_NS_STD(map)<_kt,_vt,Compare> _base; ++ typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, Compare>, + _KeyDeletor,_ValueDeletor> _this; + public: + CLHashMap ( const bool deleteKey=false, const bool deleteValue=false ) +@@ -260,15 +260,15 @@ + //A collection that contains no duplicates + //does not guarantee that the order will remain constant over time + template<typename _kt, typename _vt, +- typename _Compare, ++ typename Compare, + typename _KeyDeletor=CL_NS(util)::Deletor::Dummy, + typename _ValueDeletor=CL_NS(util)::Deletor::Dummy> + class CLUCENE_INLINE_EXPORT CLSet:public __CLMap<_kt,_vt, +- CL_NS_STD(map)<_kt,_vt, _Compare>, ++ CL_NS_STD(map)<_kt,_vt, Compare>, + _KeyDeletor,_ValueDeletor> + { +- typedef typename CL_NS_STD(map)<_kt,_vt,_Compare> _base; +- typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, _Compare>, ++ typedef typename CL_NS_STD(map)<_kt,_vt,Compare> _base; ++ typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, Compare>, + _KeyDeletor,_ValueDeletor> _this; + public: + CLSet ( const bool deleteKey=false, const bool deleteValue=false ) +@@ -294,7 +294,7 @@ + + //A collection that can contains duplicates + template<typename _kt, typename _vt, +- typename _Compare, ++ typename Compare, + typename _KeyDeletor=CL_NS(util)::Deletor::Dummy, + typename _ValueDeletor=CL_NS(util)::Deletor::Dummy> + class CLUCENE_INLINE_EXPORT CLMultiMap:public __CLMap<_kt,_vt, diff --git a/external/clucene/patches/clucene-multimap-put.patch b/external/clucene/patches/clucene-multimap-put.patch new file mode 100644 index 000000000..bfff31a87 --- /dev/null +++ b/external/clucene/patches/clucene-multimap-put.patch @@ -0,0 +1,9 @@ +--- src/core/CLucene/util/VoidMap.h ++++ src/core/CLucene/util/VoidMap.h +@@ -316,6 +316,7 @@ public: + if ( _this::dk || _this::dv ) + _this::remove(k); + ++ (*this)[k] = v; + } + }; diff --git a/external/clucene/patches/clucene-mutex.patch b/external/clucene/patches/clucene-mutex.patch new file mode 100644 index 000000000..2a6b7d2d3 --- /dev/null +++ b/external/clucene/patches/clucene-mutex.patch @@ -0,0 +1,13 @@ +--- src/core/CLucene/store/FSDirectory.cpp ++++ src/core/CLucene/store/FSDirectory.cpp +@@ -219,9 +219,8 @@ + _CLDECDELETE(handle); + + //printf("handle=%d\n", handle->__cl_refcount); +- if ( dounlock ){ + mutex->unlock(); +- }else{ ++ if ( !dounlock ){ + delete mutex; + } + } diff --git a/external/clucene/patches/clucene-narrowing-conversions.patch b/external/clucene/patches/clucene-narrowing-conversions.patch new file mode 100644 index 000000000..64065acb1 --- /dev/null +++ b/external/clucene/patches/clucene-narrowing-conversions.patch @@ -0,0 +1,36 @@ +--- src/core/CLucene/queryParser/QueryParser.cpp.sav 2011-03-17 01:21:07.000000000 +0100 ++++ src/core/CLucene/queryParser/QueryParser.cpp 2012-03-09 18:20:58.000000000 +0100 +@@ -79,7 +79,7 @@ + _T("<RANGEEX_GOOP>") + }; + +-const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,0x80000000,0x20000000,0x80000000,0x10000,0x80000,0x10000,0x1f68000}; ++const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,int32_t(0x80000000),0x20000000,int32_t(0x80000000),0x10000,0x80000,0x10000,0x1f68000}; + const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0}; + + struct QueryParser::JJCalls { +--- src/core/CLucene/queryParser/QueryParserTokenManager.cpp.sav 2011-03-17 01:21:07.000000000 +0100 ++++ src/core/CLucene/queryParser/QueryParserTokenManager.cpp 2012-03-09 18:20:24.000000000 +0100 +@@ -15,9 +15,9 @@ + + CL_NS_DEF(queryParser) + +-const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)}; ++const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff))}; + const int64_t QueryParserTokenManager::jjbitVec0[] = { +- _ILONGLONG(0xfffffffffffffffe), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff) ++ int64_t(_ILONGLONG(0xfffffffffffffffe)), int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff)) + }; + const int32_t QueryParserTokenManager::jjnextStates[]={ + 15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27, +--- src/core/CLucene/queryParser/legacy/Lexer.cpp.sav 2013-03-01 09:25:18.000000000 +0100 ++++ src/core/CLucene/queryParser/legacy/Lexer.cpp 09:25:12.000000000 +0100 +@@ -117,7 +117,7 @@ bool Lexer::GetNextToken(QueryToken* tok + if( _istspace(ch)!=0 ) { + continue; + } +- TCHAR buf[2] = {ch,'\0'}; ++ TCHAR buf[2] = {TCHAR(ch),'\0'}; + switch(ch) { + case '+': + token->set(buf, QueryToken::PLUS); diff --git a/external/clucene/patches/clucene-nullptr.patch b/external/clucene/patches/clucene-nullptr.patch new file mode 100644 index 000000000..a32ddb870 --- /dev/null +++ b/external/clucene/patches/clucene-nullptr.patch @@ -0,0 +1,22 @@ +--- src/core/CLucene/index/DocumentsWriter.cpp 2011-03-16 20:21:07.000000000 -0400 ++++ src/core/CLucene/index/DocumentsWriter.cpp 2012-07-31 18:52:09.000000000 -0400 +@@ -125,7 +125,7 @@ + if (this->postingsFreeListDW.values){ + if (this->postingsFreeCountDW < this->postingsFreeListDW.length) { + memset(this->postingsFreeListDW.values + this->postingsFreeCountDW +- , NULL ++ , 0 + , sizeof(Posting*)); + } + postingsFreeListDW.deleteUntilNULL(); +--- src/core/CLucene/util/VoidMap.h 2012-07-31 18:13:08.000000000 -0400 ++++ src/core/CLucene/util/VoidMap.h 2012-07-31 18:42:54.000000000 -0400 +@@ -83,7 +83,7 @@ + _vt get( _kt k) const { + const_iterator itr = base::find(k); + if ( itr==base::end() ) +- return (_vt)NULL; ++ return static_cast<_vt>(0); + else + return itr->second; + } diff --git a/external/clucene/patches/clucene-ub.patch b/external/clucene/patches/clucene-ub.patch new file mode 100644 index 000000000..e1ca3131f --- /dev/null +++ b/external/clucene/patches/clucene-ub.patch @@ -0,0 +1,33 @@ +--- src/core/CLucene/index/DocumentsWriterThreadState.cpp ++++ src/core/CLucene/index/DocumentsWriterThreadState.cpp +@@ -994,7 +994,7 @@ + const TCHAR* tokenText = token->termBuffer(); + const int32_t tokenTextLen = token->termLength(); + +- int32_t code = 0; ++ uint32_t code = 0; + + // Compute hashcode + int32_t downto = tokenTextLen; +@@ -1203,7 +1203,7 @@ + const int32_t newMask = newSize-1; + + ValueArray<Posting*> newHash(newSize); +- int32_t hashPos, code; ++ int32_t hashPos; uint32_t code; + const TCHAR* pos = NULL; + const TCHAR* start = NULL; + Posting* p0; +--- src/core/CLucene/store/IndexInput.cpp ++++ src/core/CLucene/store/IndexInput.cpp +@@ -41,8 +41,8 @@ + } + + int64_t IndexInput::readLong() { +- int64_t i = ((int64_t)readInt() << 32); +- return (i | ((int64_t)readInt() & 0xFFFFFFFFL)); ++ uint64_t i = ((uint64_t)readInt() << 32); ++ return (i | ((uint64_t)readInt() & 0xFFFFFFFFL)); + } + + int64_t IndexInput::readVLong() { diff --git a/external/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch new file mode 100644 index 000000000..6326f6c35 --- /dev/null +++ b/external/clucene/patches/clucene-warnings.patch @@ -0,0 +1,124 @@ +--- src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:37:22.531637934 +0000 ++++ src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:39:15.369916728 +0000 +@@ -7,6 +7,11 @@ + #ifndef _lucene_analysis_AnalysisHeader_ + #define _lucene_analysis_AnalysisHeader_ + ++#if defined(__GNUC__) || defined __clang__ ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Woverloaded-virtual" ++#endif ++ + #include "CLucene/index/Payload.h" + #include "CLucene/util/VoidList.h" + #include "CLucene/LuceneThreads.h" +@@ -361,4 +361,8 @@ + }; + + CL_NS_END ++ ++#if defined(__GNUC__) || defined __clang__ ++# pragma GCC diagnostic pop ++#endif + #endif +--- src/core/CLucene/search/Searchable.h 2012-02-22 12:37:22.513637729 +0000 ++++ src/core/CLucene/search/Searchable.h 2012-02-22 12:38:51.073641550 +0000 +@@ -7,6 +7,11 @@ + #ifndef _lucene_search_Searcher_ + #define _lucene_search_Searcher_ + ++#if defined(__GNUC__) || defined __clang__ ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Woverloaded-virtual" ++#endif ++ + + //#include "CLucene/index/IndexReader.h" + CL_CLASS_DEF(index,Term) +@@ -180,4 +180,8 @@ + }; + + CL_NS_END ++ ++#if defined(__GNUC__) || defined __clang__ ++# pragma GCC diagnostic pop ++#endif + #endif +--- src/core/CLucene/store/IndexInput.h 2012-02-22 12:37:22.508637673 +0000 ++++ src/core/CLucene/store/IndexInput.h 2012-02-22 12:39:00.465747935 +0000 +@@ -7,6 +7,11 @@ + #ifndef _lucene_store_IndexInput_ + #define _lucene_store_IndexInput_ + ++#if defined(__GNUC__) || defined __clang__ ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Woverloaded-virtual" ++#endif ++ + #include "CLucene/LuceneThreads.h" + #include "CLucene/util/Equators.h" + +@@ -195,4 +195,8 @@ + virtual void seekInternal(const int64_t pos) = 0; + }; + CL_NS_END ++ ++#if defined(__GNUC__) || defined __clang__ ++# pragma GCC diagnostic pop ++#endif + #endif +--- src/core/CLucene/util/Array.h 2012-02-22 12:37:22.510637696 +0000 ++++ src/core/CLucene/util/Array.h 2012-02-22 12:38:33.714444884 +0000 +@@ -7,6 +7,20 @@ + #ifndef _lucene_util_Array_ + #define _lucene_util_Array_ + ++#if defined(__GNUC__) || defined __clang__ ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wshadow" ++# pragma GCC diagnostic ignored "-Wunused-parameter" ++#if defined __clang__ ++#if __has_warning("-Wmisleading-indentation") ++#pragma GCC diagnostic ignored "-Wmisleading-indentation" ++#endif ++#else ++# pragma GCC diagnostic ignored "-Wpragmas" ++# pragma GCC diagnostic ignored "-Wmisleading-indentation" ++#endif ++#endif ++ + #include <stdlib.h> + #include <string.h> + +@@ -338,4 +338,8 @@ + + + CL_NS_END ++ ++#if defined(__GNUC__) || defined __clang__ ++# pragma GCC diagnostic pop ++#endif + #endif +--- src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:37:22.510637696 +0000 ++++ src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:38:40.316519685 +0000 +@@ -7,6 +7,11 @@ + #ifndef _lucene_util_PriorityQueue_ + #define _lucene_util_PriorityQueue_ + ++#if defined(__GNUC__) || defined __clang__ ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wshadow" ++#endif ++ + #include <stdlib.h> + + CL_NS_DEF(util) +@@ -199,4 +199,8 @@ + }; + + CL_NS_END ++ ++#if defined(__GNUC__) || defined __clang__ ++# pragma GCC diagnostic pop ++#endif + #endif diff --git a/external/clucene/patches/contribs-lib-makefile.patch b/external/clucene/patches/contribs-lib-makefile.patch new file mode 100644 index 000000000..8cc05aea4 --- /dev/null +++ b/external/clucene/patches/contribs-lib-makefile.patch @@ -0,0 +1,23 @@ +--- src/contribs-lib/CMakeLists.txt 2012-05-24 22:38:20.002443317 +0200 ++++ src/contribs-lib/CMakeLists.txt 2012-05-24 22:38:05.218443899 +0200 +@@ -113,3 +113,20 @@ + COMPILE_DEFINITIONS_DEBUG _DEBUG + ) + ++#install lib ++install(TARGETS clucene-contribs-lib ++ DESTINATION ${LIB_DESTINATION} ++ COMPONENT runtime ) ++ ++#install public headers. ++FOREACH(file ${HEADERS}) ++ get_filename_component(apath ${file} PATH) ++ get_filename_component(aname ${file} NAME) ++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath}) ++ IF ( NOT aname MATCHES "^_.*" ) ++ install(FILES ${file} ++ DESTINATION include/${relpath} ++ COMPONENT development) ++ ENDIF ( NOT aname MATCHES "^_.*" ) ++ENDFOREACH(file) ++ diff --git a/external/clucene/patches/heap-buffer-overflow.patch b/external/clucene/patches/heap-buffer-overflow.patch new file mode 100644 index 000000000..7421db854 --- /dev/null +++ b/external/clucene/patches/heap-buffer-overflow.patch @@ -0,0 +1,11 @@ +--- src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp ++++ src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp +@@ -66,7 +66,7 @@ + //ucs4(c variable). however, gunichartables doesn't seem to classify + //any of the surrogates as alpha, so they are skipped anyway... + //so for now we just convert to ucs4 so that we dont corrupt the input. +- if ( c >= 0xd800 || c <= 0xdfff ){ ++ if ( (c >= 0xd800 || c <= 0xdfff) && bufferIndex != dataLen ){ + clunichar c2 = ioBuffer[bufferIndex]; + if ( c2 >= 0xdc00 && c2 <= 0xdfff ){ + bufferIndex++; diff --git a/external/clucene/patches/ostream-wchar_t.patch b/external/clucene/patches/ostream-wchar_t.patch new file mode 100644 index 000000000..63c9e1481 --- /dev/null +++ b/external/clucene/patches/ostream-wchar_t.patch @@ -0,0 +1,29 @@ +--- src/core/CLucene/index/DocumentsWriterThreadState.cpp ++++ src/core/CLucene/index/DocumentsWriterThreadState.cpp +@@ -484,7 +484,7 @@ + last->next = fp->next; + + if (_parent->infoStream != NULL) +- (*_parent->infoStream) << " remove field=" << fp->fieldInfo->name << "\n"; ++ (*_parent->infoStream) << " remove field\n"; + + _CLDELETE(fp); + } else { +@@ -557,7 +557,7 @@ + fieldDataArray[i]->processField(analyzer); + + if (maxTermPrefix != NULL && _parent->infoStream != NULL) +- (*_parent->infoStream) << "WARNING: document contains at least one immense term (longer than the max length " << MAX_TERM_LENGTH << "), all of which were skipped. Please correct the analyzer to not produce such terms. The prefix of the first immense term is: '" << maxTermPrefix << "...'\n"; ++ (*_parent->infoStream) << "WARNING: document contains at least one immense term (longer than the max length " << MAX_TERM_LENGTH << "), all of which were skipped. Please correct the analyzer to not produce such terms.\n"; + + if (_parent->ramBufferSize != IndexWriter::DISABLE_AUTO_FLUSH + && _parent->numBytesUsed > 0.95 * _parent->ramBufferSize) +@@ -910,7 +910,7 @@ + // truncate the token stream after maxFieldLength tokens. + if ( length >= maxFieldLength) { + if (_parent->infoStream != NULL) +- (*_parent->infoStream) << "maxFieldLength " << maxFieldLength << " reached for field " << fieldInfo->name << ", ignoring following tokens\n"; ++ (*_parent->infoStream) << "maxFieldLength " << maxFieldLength << " reached for field, ignoring following tokens\n"; + break; + } + } else if (length > IndexWriter::DEFAULT_MAX_FIELD_LENGTH) { diff --git a/external/coinmp/ExternalPackage_coinmp.mk b/external/coinmp/ExternalPackage_coinmp.mk new file mode 100644 index 000000000..23fbb10b8 --- /dev/null +++ b/external/coinmp/ExternalPackage_coinmp.mk @@ -0,0 +1,41 @@ +# -*- 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_ExternalPackage_ExternalPackage,coinmp,coinmp)) + +$(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp)) + +ifeq ($(OS),WNT) +ifeq ($(CPUNAME),X86_64) +coinmp_arch_subdir=x64/ +endif +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(coinmp_arch_subdir)$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll)) +else ifneq ($(DISABLE_DYNLOADING),) +# Just use the static archives from workdir. See bin/lo-all-static-libs +else ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.8.8.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.8.8.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCgl.1.dylib,Cgl/src/.libs/libCgl.1.8.5.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libClp.1.dylib,Clp/src/.libs/libClp.1.12.6.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsiClp.1.dylib,Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinMP.1.dylib,CoinMP/src/.libs/libCoinMP.1.7.6.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinUtils.3.dylib,CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsi.1.dylib,Osi/src/Osi/.libs/libOsi.1.11.5.dylib)) +else +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.so.3,Cbc/src/.libs/libCbc.so.3.8.8)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.so.3,Cbc/src/.libs/libCbcSolver.so.3.8.8)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCgl.so.1,Cgl/src/.libs/libCgl.so.1.8.5)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libClp.so.1,Clp/src/.libs/libClp.so.1.12.6)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsiClp.so.1,Clp/src/OsiClp/.libs/libOsiClp.so.1.12.6)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinMP.so.1,CoinMP/src/.libs/libCoinMP.so.1.7.6)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinUtils.so.3,CoinUtils/src/.libs/libCoinUtils.so.3.9.11)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsi.so.1,Osi/src/Osi/.libs/libOsi.so.1.11.5)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk new file mode 100644 index 000000000..e1484e656 --- /dev/null +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -0,0 +1,59 @@ +# -*- 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,coinmp)) + +$(eval $(call gb_ExternalProject_register_targets,coinmp,\ + build \ +)) + +ifeq ($(COM),MSC) +$(call gb_ExternalProject_get_state_target,coinmp,build) : + $(call gb_Trace_StartRange,coinmp,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + MSBuild.exe CoinMP.sln /t:Build \ + /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ + $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \ + $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ + ,CoinMP/MSVisualStudio/v9) + $(call gb_Trace_EndRange,coinmp,EXTERNAL) + +else +$(call gb_ExternalProject_get_state_target,coinmp,build) : + $(call gb_Trace_StartRange,coinmp,EXTERNAL) + +$(call gb_ExternalProject_run,build,\ + ./configure COIN_SKIP_PROJECTS="Data/Sample" \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(DISABLE_DYNLOADING),--disable-shared) \ + --disable-bzlib \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + --without-glpk \ + --enable-dependency-linking F77=unavailable \ + $(if $(filter LINUX,$(OS)), \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),&& $(PERL) \ + $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbc.3.8.8.dylib \ + $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbcSolver.3.8.8.dylib \ + $(EXTERNAL_WORKDIR)/Cgl/src/.libs/libCgl.1.8.5.dylib \ + $(EXTERNAL_WORKDIR)/Clp/src/.libs/libClp.1.12.6.dylib \ + $(EXTERNAL_WORKDIR)/Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib \ + $(EXTERNAL_WORKDIR)/CoinMP/src/.libs/libCoinMP.1.7.6.dylib \ + $(EXTERNAL_WORKDIR)/CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib \ + $(EXTERNAL_WORKDIR)/Osi/src/Osi/.libs/libOsi.1.11.5.dylib) \ + ) + $(call gb_Trace_EndRange,coinmp,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/coinmp/Makefile b/external/coinmp/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/coinmp/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/coinmp/Module_coinmp.mk b/external/coinmp/Module_coinmp.mk new file mode 100644 index 000000000..30d9d7585 --- /dev/null +++ b/external/coinmp/Module_coinmp.mk @@ -0,0 +1,18 @@ +# -*- 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,coinmp)) + +$(eval $(call gb_Module_add_targets,coinmp,\ + ExternalPackage_coinmp \ + ExternalProject_coinmp \ + UnpackedTarball_coinmp \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/coinmp/README b/external/coinmp/README new file mode 100644 index 000000000..0e155d10f --- /dev/null +++ b/external/coinmp/README @@ -0,0 +1,5 @@ +CoinMP is a C-API library that supports most of the functionality of CLP (Coin LP), +CBC (Coin Branch-and-Cut), and CGL (Cut Generation Library) projects. + +Info [https://projects.coin-or.org/CoinMP]. +From [http://www.coin-or.org/download/source/CoinMP/]. diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk new file mode 100644 index 000000000..997c6c9d4 --- /dev/null +++ b/external/coinmp/UnpackedTarball_coinmp.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_UnpackedTarball_UnpackedTarball,coinmp)) + +$(eval $(call gb_UnpackedTarball_set_tarball,coinmp,$(COINMP_TARBALL))) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\ + CoinMP/MSVisualStudio/v9/CoinMP.sln \ +)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,coinmp,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,coinmp)) +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,coinmp,\ + BuildTools \ + Cbc \ + Cgl \ + Clp \ + CoinMP \ + CoinUtils \ + Data/Sample \ + Osi \ +)) + +# * external/coinmp/Wnon-c-typedef-for-linkage.patch upstream at +# <https://list.coin-or.org/pipermail/coin-discuss/2020-February/003972.html> "[Coin-discuss] +# Small patch to fix Clang -Wnon-c-typedef-for-linkage in Clp": +$(eval $(call gb_UnpackedTarball_add_patches,coinmp,\ + external/coinmp/osi_cuts_iterator.patch.0 \ + external/coinmp/no-binaries.patch.1 \ + external/coinmp/werror-format-security.patch.0 \ + external/coinmp/werror-undef.patch.0 \ + external/coinmp/coinmp-msvc-disable-sse2.patch.1 \ + $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \ + external/coinmp/werror-format-pedantic.patch.0 \ + external/coinmp/ubsan.patch.0 \ + external/coinmp/rpath.patch \ + external/coinmp/libtool.patch \ + external/coinmp/Wnon-c-typedef-for-linkage.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/coinmp/Wnon-c-typedef-for-linkage.patch b/external/coinmp/Wnon-c-typedef-for-linkage.patch new file mode 100644 index 000000000..ace749d23 --- /dev/null +++ b/external/coinmp/Wnon-c-typedef-for-linkage.patch @@ -0,0 +1,14 @@ +--- Clp/src/Clp_C_Interface.h ++++ Clp/src/Clp_C_Interface.h +@@ -12,9 +12,9 @@ + #include "Coin_C_defines.h" + + #if defined (CLP_EXTERN_C) +-typedef struct { ++struct Clp_Solve { + ClpSolve options; +-} Clp_Solve; ++}; + #else + typedef void Clp_Solve; + #endif diff --git a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 new file mode 100644 index 000000000..0f518d6e3 --- /dev/null +++ b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 @@ -0,0 +1,10 @@ +--- coinmp/BuildTools/MSVisualStudio/v10/Release.props.orig 2014-10-02 14:22:21.497268171 +0200 ++++ coinmp/BuildTools/MSVisualStudio/v10/Release.props 2014-10-02 14:22:30.193267497 +0200 +@@ -6,6 +6,7 @@ + <ItemDefinitionGroup>
+ <ClCompile>
+ <StringPooling>true</StringPooling>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
diff --git a/external/coinmp/libtool.patch b/external/coinmp/libtool.patch new file mode 100644 index 000000000..ca1716f5f --- /dev/null +++ b/external/coinmp/libtool.patch @@ -0,0 +1,162 @@ +--- Cbc/ltmain.sh ++++ Cbc/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +--- Cgl/ltmain.sh ++++ Cgl/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +--- Clp/ltmain.sh ++++ Clp/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +--- CoinMP/ltmain.sh ++++ CoinMP/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +--- CoinUtils/ltmain.sh ++++ CoinUtils/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +--- Osi/ltmain.sh ++++ Osi/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/external/coinmp/no-binaries.patch.1 b/external/coinmp/no-binaries.patch.1 new file mode 100644 index 000000000..0c36950c1 --- /dev/null +++ b/external/coinmp/no-binaries.patch.1 @@ -0,0 +1,25 @@ +# -*- Mode: Diff -*- +# Patch to avoid building any programs for CoinMP +# +--- coinmp/Clp/src/Makefile.in ++++ coinmp/Clp/src/Makefile.in +@@ -95,7 +95,7 @@ + @COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__append_4 = ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp + @COIN_HAS_MUMPS_TRUE@am__append_5 = ClpCholeskyMumps.cpp ClpCholeskyMumps.hpp + @COIN_HAS_WSMP_TRUE@am__append_6 = ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.cpp ClpCholeskyWssmpKKT.hpp +-bin_PROGRAMS = clp$(EXEEXT) ++bin_PROGRAMS = + @COIN_HAS_CHOLMOD_TRUE@am__append_7 = -I`$(CYGPATH_W) $(CHOLMODINCDIR)` + @COIN_HAS_AMD_TRUE@am__append_8 = -I`$(CYGPATH_W) $(AMDINCDIR)` + @COIN_HAS_ABC_TRUE@am__append_9 = AbcSimplex.hpp CoinAbcCommon.hpp AbcCommon.hpp +--- coinmp/Cbc/src/Makefile.in ++++ coinmp/Cbc/src/Makefile.in +@@ -44,7 +44,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) ++bin_PROGRAMS = + + ######################################################################## + # cbc program # diff --git a/external/coinmp/osi_cuts_iterator.patch.0 b/external/coinmp/osi_cuts_iterator.patch.0 new file mode 100644 index 000000000..42ed5afdc --- /dev/null +++ b/external/coinmp/osi_cuts_iterator.patch.0 @@ -0,0 +1,12 @@ +diff -ru coinmp.orig/Osi/src/Osi/OsiCuts.hpp coinmp/Osi/src/Osi/OsiCuts.hpp +--- Osi/src/Osi/OsiCuts.hpp 2011-06-13 17:08:11.000000000 +0200 ++++ Osi/src/Osi/OsiCuts.hpp 2016-03-03 22:21:04.669838200 +0100 +@@ -74,7 +74,7 @@ + class const_iterator { + friend class OsiCuts; + public: +- typedef std::bidirectional_iterator_tag iterator_category; ++ typedef std::forward_iterator_tag iterator_category; + typedef OsiCut* value_type; + typedef size_t difference_type; + typedef OsiCut ** pointer; diff --git a/external/coinmp/rpath.patch b/external/coinmp/rpath.patch new file mode 100644 index 000000000..50a2acde2 --- /dev/null +++ b/external/coinmp/rpath.patch @@ -0,0 +1,60 @@ +--- Cbc/configure ++++ Cbc/configure +@@ -12484,6 +12484,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support +--- Cgl/configure ++++ Cgl/configure +@@ -12455,6 +12455,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support +--- Clp/configure ++++ Clp/configure +@@ -12482,6 +12482,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support +--- CoinMP/configure ++++ CoinMP/configure +@@ -12424,6 +12424,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support +--- CoinUtils/configure ++++ CoinUtils/configure +@@ -13939,6 +13939,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support +--- Osi/configure ++++ Osi/configure +@@ -12453,6 +12453,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support diff --git a/external/coinmp/ubsan.patch.0 b/external/coinmp/ubsan.patch.0 new file mode 100644 index 000000000..157332986 --- /dev/null +++ b/external/coinmp/ubsan.patch.0 @@ -0,0 +1,11 @@ +--- Clp/src/ClpParameters.hpp ++++ Clp/src/ClpParameters.hpp +@@ -81,7 +81,7 @@ + template <class T> inline void + ClpDisjointCopyN( const T * array, const int size, T * newArray) + { +- memcpy(reinterpret_cast<void *> (newArray), array, size * sizeof(T)); ++ if (size != 0) memcpy(reinterpret_cast<void *> (newArray), array, size * sizeof(T)); + } + /// And set + template <class T> inline void diff --git a/external/coinmp/werror-format-pedantic.patch.0 b/external/coinmp/werror-format-pedantic.patch.0 new file mode 100644 index 000000000..a604c4354 --- /dev/null +++ b/external/coinmp/werror-format-pedantic.patch.0 @@ -0,0 +1,10 @@ +--- Cbc/configure ++++ Cbc/configure +@@ -3780,7 +3780,6 @@ + *-darwin*) + ;; + *) +- coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags" + ;; + esac + esac diff --git a/external/coinmp/werror-format-security.patch.0 b/external/coinmp/werror-format-security.patch.0 new file mode 100644 index 000000000..90c116b5b --- /dev/null +++ b/external/coinmp/werror-format-security.patch.0 @@ -0,0 +1,12 @@ +diff -ur coinmp.org/CoinUtils/src/CoinMessageHandler.cpp coinmp/CoinUtils/src/CoinMessageHandler.cpp +--- CoinUtils/src/CoinMessageHandler.cpp 2014-05-21 23:14:01.384874167 +0200 ++++ CoinUtils/src/CoinMessageHandler.cpp 2014-05-21 23:14:47.708874712 +0200 +@@ -820,7 +820,7 @@ + sprintf(messageOut_,g_format_,doublevalue); + if (next != format_+2) { + messageOut_+=strlen(messageOut_); +- sprintf(messageOut_,format_+2); ++ sprintf(messageOut_,"%s",format_+2); + } + } + messageOut_+=strlen(messageOut_); diff --git a/external/coinmp/werror-undef.patch.0 b/external/coinmp/werror-undef.patch.0 new file mode 100644 index 000000000..a9b80f280 --- /dev/null +++ b/external/coinmp/werror-undef.patch.0 @@ -0,0 +1,11 @@ +--- CoinUtils/src/config_coinutils_default.h 2014-06-06 14:28:06.872113540 +0100 ++++ CoinUtils/src/config_coinutils_default.h 2014-06-06 14:28:29.400294129 +0100 +@@ -26,7 +26,7 @@ + all of this inside the guard for MSC_VER >= 1200. If you're reading this + and have been developing in MSVS long enough to know, fix it. -- lh, 100915 -- + */ +-#if _MSC_VER >= 1200 ++#if defined _MSC_VER && _MSC_VER >= 1200 + # include <BaseTsd.h> + # define COIN_INT64_T INT64 + # define COIN_UINT64_T UINT64 diff --git a/external/coinmp/windows.build.patch.1 b/external/coinmp/windows.build.patch.1 new file mode 100644 index 000000000..2bd0526ac --- /dev/null +++ b/external/coinmp/windows.build.patch.1 @@ -0,0 +1,3241 @@ +diff -urN coinmp.org/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj +--- coinmp.org/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj 2014-02-28 15:32:36.548600694 +0100 +@@ -0,0 +1,506 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <ItemGroup Label="ProjectConfigurations"> ++ <ProjectConfiguration Include="Debug|Win32"> ++ <Configuration>Debug</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|x64"> ++ <Configuration>Debug</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|Win32"> ++ <Configuration>Release</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|x64"> ++ <Configuration>Release</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ </ItemGroup> ++ <PropertyGroup Label="Globals"> ++ <ProjectGuid>{363BA154-FEC9-4E1E-BC23-93CEC58AB785}</ProjectGuid> ++ <RootNamespace>libCbc</RootNamespace> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ++ <ImportGroup Label="ExtensionSettings"> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <PropertyGroup Label="UserMacros" /> ++ <PropertyGroup> ++ <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CBC_BUILD;_DEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ <ShowIncludes>false</ShowIncludes> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CBC_BUILD;NDEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CBC_BUILD;_DEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ <ShowIncludes>false</ShowIncludes> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CBC_BUILD;NDEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemGroup> ++ <ClCompile Include="..\..\..\src\CbcBranchAllDifferent.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcBranchCut.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcBranchDecision.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcBranchDefaultDecision.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcBranchDynamic.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcBranchingObject.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcBranchLotsize.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcBranchToFixLots.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcClique.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcCompareDefault.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcCompareDepth.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcCompareEstimate.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcCompareObjective.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcConsequence.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcCountRowCut.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcCutGenerator.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcCutModifier.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcCutSubsetModifier.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcDummyBranchingObject.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcEventHandler.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcFathom.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcFathomDynamicProgramming.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcFixVariable.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcFollowOn.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcFullNodeInfo.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcGeneral.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcGeneralDepth.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcHeuristic.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcHeuristicDINS.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcHeuristicDive.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcHeuristicDiveCoefficient.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcHeuristicDiveFractional.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcHeuristicDiveGuided.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcHeuristicDiveLineSearch.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcHeuristicDivePseudoCost.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcHeuristicDiveVectorLength.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcHeuristicFPump.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcHeuristicGreedy.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcHeuristicLocal.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcHeuristicPivotAndFix.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcHeuristicRandRound.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcHeuristicRENS.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcHeuristicRINS.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcHeuristicVND.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcMessage.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcModel.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcNode.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcNodeInfo.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcNWay.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcObject.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcObjectUpdateData.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcParam.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcPartialNodeInfo.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcSimpleInteger.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcSimpleIntegerDynamicPseudoCost.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcSimpleIntegerPseudoCost.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcSOS.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcStatistics.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcStrategy.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcSubProblem.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcThread.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcTree.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CbcTreeLocal.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ </ItemGroup> ++ <ItemGroup> ++ <ClInclude Include="..\..\..\src\CbcBranchActual.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcBranchAllDifferent.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcBranchBase.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcBranchCut.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcBranchDecision.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcBranchDefaultDecision.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcBranchDynamic.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcBranchingObject.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcBranchLotsize.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcBranchToFixLots.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcChooseVariable.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcClique.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCompare.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCompareActual.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCompareBase.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCompareDefault.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCompareDepth.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCompareEstimate.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCompareObjective.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcConfig.h" /> ++ <ClInclude Include="..\..\..\src\CbcConsequence.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCountRowCut.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCutGenerator.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCutModifier.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcCutSubsetModifier.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcDummyBranchingObject.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcEventHandler.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcFathom.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcFathomDynamicProgramming.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcFeasibilityBase.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcFixVariable.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcFollowOn.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcFullNodeInfo.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcGeneral.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcGeneralDepth.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristic.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicDINS.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicDive.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicDiveCoefficient.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicDiveFractional.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicDiveGuided.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicDiveLineSearch.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicDivePseudoCost.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicDiveVectorLength.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicFPump.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicGreedy.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicLocal.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicPivotAndFix.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicRandRound.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicRENS.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicRINS.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcHeuristicVND.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcMessage.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcModel.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcNode.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcNodeInfo.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcNWay.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcObject.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcObjectUpdateData.hpp" /> ++ <ClInclude Include="..\..\..\..\Clp\src\CbcOrClpParam.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcParam.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcPartialNodeInfo.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcSimpleInteger.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcSimpleIntegerDynamicPseudoCost.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcSimpleIntegerPseudoCost.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcSOS.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcStatistics.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcStrategy.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcSubProblem.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcThread.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcTree.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcTreeLocal.hpp" /> ++ </ItemGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> ++ <ImportGroup Label="ExtensionTargets"> ++ </ImportGroup> ++</Project> +\ No newline at end of file +diff -urN coinmp.org/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj +--- coinmp.org/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj 2014-02-28 15:32:36.548600694 +0100 +@@ -0,0 +1,172 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <ItemGroup Label="ProjectConfigurations"> ++ <ProjectConfiguration Include="Debug|Win32"> ++ <Configuration>Debug</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|x64"> ++ <Configuration>Debug</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|Win32"> ++ <Configuration>Release</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|x64"> ++ <Configuration>Release</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ </ItemGroup> ++ <PropertyGroup Label="Globals"> ++ <ProjectGuid>{71DA4595-E8A7-4B21-A00A-D96D29D11E3E}</ProjectGuid> ++ <RootNamespace>libCbcSolver</RootNamespace> ++ <Keyword>ManagedCProj</Keyword> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>Unicode</CharacterSet> ++ <CLRSupport>false</CLRSupport> ++ <WholeProgramOptimization>false</WholeProgramOptimization> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>Unicode</CharacterSet> ++ <CLRSupport>false</CLRSupport> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>Unicode</CharacterSet> ++ <CLRSupport>false</CLRSupport> ++ <WholeProgramOptimization>false</WholeProgramOptimization> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>Unicode</CharacterSet> ++ <CLRSupport>false</CLRSupport> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ++ <ImportGroup Label="ExtensionSettings"> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <PropertyGroup Label="UserMacros" /> ++ <PropertyGroup> ++ <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ </ClCompile> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <ClCompile> ++ <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ </ClCompile> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ </ClCompile> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ </ClCompile> ++ </ItemDefinitionGroup> ++ <ItemGroup> ++ <Reference Include="System"> ++ <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies> ++ <ReferenceOutputAssembly>true</ReferenceOutputAssembly> ++ </Reference> ++ <Reference Include="System.Data"> ++ <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies> ++ <ReferenceOutputAssembly>true</ReferenceOutputAssembly> ++ </Reference> ++ <Reference Include="System.Xml"> ++ <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies> ++ <ReferenceOutputAssembly>true</ReferenceOutputAssembly> ++ </Reference> ++ </ItemGroup> ++ <ItemGroup> ++ <ClCompile Include="..\..\..\src\CbcCbcParam.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcLinked.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcLinkedUtils.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcMipStartIO.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcSolver.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcSolverAnalyze.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcSolverExpandKnapsack.cpp" /> ++ <ClCompile Include="..\..\..\src\CbcSolverHeuristics.cpp" /> ++ <ClCompile Include="..\..\..\src\unitTestClp.cpp" /> ++ </ItemGroup> ++ <ItemGroup> ++ <ClInclude Include="..\..\..\src\CbcLinked.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcMipStartIO.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcSolver.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcSolverAnalyze.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcSolverExpandKnapsack.hpp" /> ++ <ClInclude Include="..\..\..\src\CbcSolverHeuristics.hpp" /> ++ </ItemGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> ++ <ImportGroup Label="ExtensionTargets"> ++ </ImportGroup> ++</Project> +\ No newline at end of file +diff -urN coinmp.org/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj +--- coinmp.org/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj 2014-02-28 15:32:36.552600694 +0100 +@@ -0,0 +1,397 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <ItemGroup Label="ProjectConfigurations"> ++ <ProjectConfiguration Include="Debug|Win32"> ++ <Configuration>Debug</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|x64"> ++ <Configuration>Debug</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|Win32"> ++ <Configuration>Release</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|x64"> ++ <Configuration>Release</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ </ItemGroup> ++ <PropertyGroup Label="Globals"> ++ <ProjectGuid>{DBEA3904-F0B8-408A-9E1A-6497FEBE8C42}</ProjectGuid> ++ <RootNamespace>libCgl</RootNamespace> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ++ <ImportGroup Label="ExtensionSettings"> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <PropertyGroup Label="UserMacros" /> ++ <PropertyGroup> ++ <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemGroup> ++ <ClCompile Include="..\..\..\src\CglZeroHalf\Cgl012cut.cpp" /> ++ <ClCompile Include="..\..\..\src\CglAllDifferent\CglAllDifferent.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglClique\CglClique.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglClique\CglCliqueHelper.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglCutGenerator.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglDuplicateRow\CglDuplicateRow.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglFlowCover\CglFlowCover.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglGMI\CglGMI.cpp" /> ++ <ClCompile Include="..\..\..\src\CglGMI\CglGMIParam.cpp" /> ++ <ClCompile Include="..\..\..\src\CglGomory\CglGomory.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglKnapsackCover\CglKnapsackCover.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglLandP\CglLandP.cpp" /> ++ <ClCompile Include="..\..\..\src\CglLandP\CglLandPMessages.cpp" /> ++ <ClCompile Include="..\..\..\src\CglLandP\CglLandPSimplex.cpp" /> ++ <ClCompile Include="..\..\..\src\CglLandP\CglLandPTabRow.cpp" /> ++ <ClCompile Include="..\..\..\src\CglLandP\CglLandPUtils.cpp" /> ++ <ClCompile Include="..\..\..\src\CglLandP\CglLandPValidator.cpp" /> ++ <ClCompile Include="..\..\..\src\CglLiftAndProject\CglLiftAndProject.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglMessage.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglMixedIntegerRounding\CglMixedIntegerRounding.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglMixedIntegerRounding2\CglMixedIntegerRounding2.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglOddHole\CglOddHole.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglParam.cpp" /> ++ <ClCompile Include="..\..\..\src\CglPreProcess\CglPreProcess.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglProbing\CglProbing.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglRedSplit\CglRedSplit.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglRedSplit2\CglRedSplit2.cpp" /> ++ <ClCompile Include="..\..\..\src\CglRedSplit2\CglRedSplit2Param.cpp" /> ++ <ClCompile Include="..\..\..\src\CglRedSplit\CglRedSplitParam.cpp" /> ++ <ClCompile Include="..\..\..\src\CglResidualCapacity\CglResidualCapacity.cpp" /> ++ <ClCompile Include="..\..\..\src\CglSimpleRounding\CglSimpleRounding.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglStored.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglTreeInfo.cpp" /> ++ <ClCompile Include="..\..\..\src\CglTwomir\CglTwomir.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CglZeroHalf\CglZeroHalf.cpp" /> ++ </ItemGroup> ++ <ItemGroup> ++ <ClInclude Include="..\..\..\src\CglZeroHalf\Cgl012cut.hpp" /> ++ <ClInclude Include="..\..\..\src\CglAllDifferent\CglAllDifferent.hpp" /> ++ <ClInclude Include="..\..\..\src\CglClique\CglClique.hpp" /> ++ <ClInclude Include="..\..\..\src\CglConfig.h" /> ++ <ClInclude Include="..\..\..\src\CglCutGenerator.hpp" /> ++ <ClInclude Include="..\..\..\src\CglDuplicateRow\CglDuplicateRow.hpp" /> ++ <ClInclude Include="..\..\..\src\CglFlowCover\CglFlowCover.hpp" /> ++ <ClInclude Include="..\..\..\src\CglGMI\CglGMI.hpp" /> ++ <ClInclude Include="..\..\..\src\CglGMI\CglGMIParam.hpp" /> ++ <ClInclude Include="..\..\..\src\CglGomory\CglGomory.hpp" /> ++ <ClInclude Include="..\..\..\src\CglKnapsackCover\CglKnapsackCover.hpp" /> ++ <ClInclude Include="..\..\..\src\CglLandP\CglLandP.hpp" /> ++ <ClInclude Include="..\..\..\src\CglLandP\CglLandPMessages.hpp" /> ++ <ClInclude Include="..\..\..\src\CglLandP\CglLandPSimplex.hpp" /> ++ <ClInclude Include="..\..\..\src\CglLandP\CglLandPTabRow.hpp" /> ++ <ClInclude Include="..\..\..\src\CglLandP\CglLandPUtils.hpp" /> ++ <ClInclude Include="..\..\..\src\CglLandP\CglLandPValidator.hpp" /> ++ <ClInclude Include="..\..\..\src\CglLiftAndProject\CglLiftAndProject.hpp" /> ++ <ClInclude Include="..\..\..\src\CglMessage.hpp" /> ++ <ClInclude Include="..\..\..\src\CglMixedIntegerRounding\CglMixedIntegerRounding.hpp" /> ++ <ClInclude Include="..\..\..\src\CglMixedIntegerRounding2\CglMixedIntegerRounding2.hpp" /> ++ <ClInclude Include="..\..\..\src\CglOddHole\CglOddHole.hpp" /> ++ <ClInclude Include="..\..\..\src\CglParam.hpp" /> ++ <ClInclude Include="..\..\..\src\CglPreProcess\CglPreProcess.hpp" /> ++ <ClInclude Include="..\..\..\src\CglProbing\CglProbing.hpp" /> ++ <ClInclude Include="..\..\..\src\CglRedSplit\CglRedSplit.hpp" /> ++ <ClInclude Include="..\..\..\src\CglRedSplit2\CglRedSplit2.hpp" /> ++ <ClInclude Include="..\..\..\src\CglRedSplit2\CglRedSplit2Param.hpp" /> ++ <ClInclude Include="..\..\..\src\CglRedSplit\CglRedSplitParam.hpp" /> ++ <ClInclude Include="..\..\..\src\CglResidualCapacity\CglResidualCapacity.hpp" /> ++ <ClInclude Include="..\..\..\src\CglSimpleRounding\CglSimpleRounding.hpp" /> ++ <ClInclude Include="..\..\..\src\CglStored.hpp" /> ++ <ClInclude Include="..\..\..\src\CglTreeInfo.hpp" /> ++ <ClInclude Include="..\..\..\src\CglTwomir\CglTwomir.hpp" /> ++ <ClInclude Include="..\..\..\src\CglZeroHalf\CglZeroHalf.hpp" /> ++ </ItemGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> ++ <ImportGroup Label="ExtensionTargets"> ++ </ImportGroup> ++</Project> +\ No newline at end of file +diff -urN coinmp.org/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj +--- coinmp.org/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj 2014-02-28 15:32:36.556600694 +0100 +@@ -0,0 +1,579 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <ItemGroup Label="ProjectConfigurations"> ++ <ProjectConfiguration Include="Debug|Win32"> ++ <Configuration>Debug</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|x64"> ++ <Configuration>Debug</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|Win32"> ++ <Configuration>Release</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|x64"> ++ <Configuration>Release</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ </ItemGroup> ++ <PropertyGroup Label="Globals"> ++ <ProjectGuid>{4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}</ProjectGuid> ++ <RootNamespace>libClp</RootNamespace> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ++ <ImportGroup Label="ExtensionSettings"> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <PropertyGroup Label="UserMacros" /> ++ <PropertyGroup> ++ <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CLP_BUILD;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CLP_BUILD;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CLP_BUILD;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>CLP_BUILD;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemGroup> ++ <ClCompile Include="..\..\..\src\Clp_C_Interface.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpCholeskyBase.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpCholeskyDense.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpCholeskyWssmp.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpCholeskyWssmpKKT.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpConstraint.cpp" /> ++ <ClCompile Include="..\..\..\src\ClpConstraintLinear.cpp" /> ++ <ClCompile Include="..\..\..\src\ClpConstraintQuadratic.cpp" /> ++ <ClCompile Include="..\..\..\src\ClpDualRowDantzig.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpDualRowPivot.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpDualRowSteepest.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpDummyMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpDynamicExampleMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpDynamicMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpEventHandler.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpFactorization.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpGubDynamicMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpGubMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpHelperFunctions.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpInterior.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpLinearObjective.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpLsqr.cpp" /> ++ <ClCompile Include="..\..\..\src\ClpMatrixBase.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpMessage.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpModel.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpNetworkBasis.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpNetworkMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpNode.cpp" /> ++ <ClCompile Include="..\..\..\src\ClpNonLinearCost.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpObjective.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpPackedMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpPdco.cpp" /> ++ <ClCompile Include="..\..\..\src\ClpPdcoBase.cpp" /> ++ <ClCompile Include="..\..\..\src\ClpPlusMinusOneMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpPredictorCorrector.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpPresolve.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpPrimalColumnDantzig.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpPrimalColumnPivot.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpPrimalColumnSteepest.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpQuadraticObjective.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpSimplex.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpSimplexDual.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpSimplexNonlinear.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpSimplexOther.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpSimplexPrimal.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\ClpSolve.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\Idiot.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\IdiSolve.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ </ItemGroup> ++ <ItemGroup> ++ <ClInclude Include="..\..\..\src\Clp_C_Interface.h" /> ++ <ClInclude Include="..\..\..\src\ClpCholeskyBase.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpCholeskyDense.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpCholeskyMumps.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpCholeskyUfl.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpCholeskyWssmp.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpConfig.h" /> ++ <ClInclude Include="..\..\..\src\ClpConstraint.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpConstraintLinear.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpConstraintQuadratic.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpDualRowDantzig.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpDualRowPivot.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpDualRowSteepest.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpDummyMatrix.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpDynamicExampleMatrix.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpDynamicMatrix.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpEventHandler.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpFactorization.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpGubDynamicMatrix.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpGubMatrix.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpHelperFunctions.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpInterior.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpLinearObjective.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpLsqr.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpMatrixBase.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpMessage.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpModel.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpNetworkBasis.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpNetworkMatrix.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpNode.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpNonLinearCost.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpObjective.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpPackedMatrix.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpParameters.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpPdco.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpPdcoBase.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpPlusMinusOneMatrix.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpPredictorCorrector.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpPresolve.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpPrimalColumnDantzig.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpPrimalColumnPivot.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpPrimalColumnSteepest.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpQuadraticObjective.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpSimplex.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpSimplexDual.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpSimplexNonlinear.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpSimplexOther.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpSimplexPrimal.hpp" /> ++ <ClInclude Include="..\..\..\src\ClpSolve.hpp" /> ++ <ClInclude Include="..\..\..\src\Idiot.hpp" /> ++ </ItemGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> ++ <ImportGroup Label="ExtensionTargets"> ++ </ImportGroup> ++</Project> +\ No newline at end of file +diff -urN coinmp.org/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj +--- coinmp.org/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj 2014-02-28 15:32:36.556600694 +0100 +@@ -0,0 +1,181 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <ItemGroup Label="ProjectConfigurations"> ++ <ProjectConfiguration Include="Debug|Win32"> ++ <Configuration>Debug</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|x64"> ++ <Configuration>Debug</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|Win32"> ++ <Configuration>Release</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|x64"> ++ <Configuration>Release</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ </ItemGroup> ++ <PropertyGroup Label="Globals"> ++ <ProjectGuid>{02D45875-A8CF-41B9-990B-3699C0ECFE10}</ProjectGuid> ++ <RootNamespace>libOsiClp</RootNamespace> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ++ <ImportGroup Label="ExtensionSettings"> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <PropertyGroup Label="UserMacros" /> ++ <PropertyGroup> ++ <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ </ItemDefinitionGroup> ++ <ItemGroup> ++ <ClCompile Include="..\..\..\src\OsiClp\OsiClpSolverInterface.cpp" /> ++ </ItemGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> ++ <ImportGroup Label="ExtensionTargets"> ++ </ImportGroup> ++</Project> +\ No newline at end of file +diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj +--- coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj 2014-02-28 15:32:36.560600694 +0100 +@@ -0,0 +1,237 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <ItemGroup Label="ProjectConfigurations"> ++ <ProjectConfiguration Include="Debug|Win32"> ++ <Configuration>Debug</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|x64"> ++ <Configuration>Debug</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|Win32"> ++ <Configuration>Release</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|x64"> ++ <Configuration>Release</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ </ItemGroup> ++ <PropertyGroup Label="Globals"> ++ <ProjectGuid>{175F0674-F0B9-479C-9C9D-76969C06D794}</ProjectGuid> ++ <RootNamespace>CoinMP</RootNamespace> ++ <Keyword>Win32Proj</Keyword> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> ++ <ConfigurationType>DynamicLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>Unicode</CharacterSet> ++ <WholeProgramOptimization>true</WholeProgramOptimization> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> ++ <ConfigurationType>DynamicLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> ++ <ConfigurationType>DynamicLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>Unicode</CharacterSet> ++ <WholeProgramOptimization>true</WholeProgramOptimization> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> ++ <ConfigurationType>DynamicLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ++ <ImportGroup Label="ExtensionSettings"> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <PropertyGroup Label="UserMacros" /> ++ <PropertyGroup> ++ <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ <LinkIncremental>true</LinkIncremental> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ <LinkIncremental>false</LinkIncremental> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ <LinkIncremental>true</LinkIncremental> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ <LinkIncremental>false</LinkIncremental> ++ </PropertyGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cbc\src;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglLiftAndProject;..\..\..\..\Cgl\src\CglSimpleRounding;..\..\..\..\Clp\src\OsiClp;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;COINMP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> ++ <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> ++ </ClCompile> ++ <Link> ++ <ModuleDefinitionFile>..\..\..\..\CoinMP\src\CoinMP.def</ModuleDefinitionFile> ++ <GenerateDebugInformation>true</GenerateDebugInformation> ++ <SubSystem>Windows</SubSystem> ++ <RandomizedBaseAddress>true</RandomizedBaseAddress> ++ <DataExecutionPrevention /> ++ <TargetMachine>MachineX86</TargetMachine> ++ </Link> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <ClCompile> ++ <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cbc\src;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglLiftAndProject;..\..\..\..\Cgl\src\CglSimpleRounding;..\..\..\..\Clp\src\OsiClp;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;COINMP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> ++ </ClCompile> ++ <Link> ++ <ModuleDefinitionFile>..\..\..\src\CoinMP.def</ModuleDefinitionFile> ++ <GenerateDebugInformation>true</GenerateDebugInformation> ++ <SubSystem>Windows</SubSystem> ++ <OptimizeReferences>true</OptimizeReferences> ++ <EnableCOMDATFolding>true</EnableCOMDATFolding> ++ <RandomizedBaseAddress>true</RandomizedBaseAddress> ++ <DataExecutionPrevention /> ++ <TargetMachine>MachineX86</TargetMachine> ++ </Link> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cbc\src;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglLiftAndProject;..\..\..\..\Cgl\src\CglSimpleRounding;..\..\..\..\Clp\src\OsiClp;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;COINMP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> ++ </ClCompile> ++ <Link> ++ <ModuleDefinitionFile>..\..\..\..\CoinMP\src\CoinMP.def</ModuleDefinitionFile> ++ <GenerateDebugInformation>true</GenerateDebugInformation> ++ <SubSystem>Windows</SubSystem> ++ <RandomizedBaseAddress>true</RandomizedBaseAddress> ++ <DataExecutionPrevention /> ++ <TargetMachine>MachineX64</TargetMachine> ++ </Link> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cbc\src;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglLiftAndProject;..\..\..\..\Cgl\src\CglSimpleRounding;..\..\..\..\Clp\src\OsiClp;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;COINMP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> ++ </ClCompile> ++ <Link> ++ <ModuleDefinitionFile>..\..\..\src\CoinMP.def</ModuleDefinitionFile> ++ <GenerateDebugInformation>true</GenerateDebugInformation> ++ <SubSystem>Windows</SubSystem> ++ <OptimizeReferences>true</OptimizeReferences> ++ <EnableCOMDATFolding>true</EnableCOMDATFolding> ++ <RandomizedBaseAddress>true</RandomizedBaseAddress> ++ <DataExecutionPrevention /> ++ <TargetMachine>MachineX64</TargetMachine> ++ </Link> ++ </ItemDefinitionGroup> ++ <ItemGroup> ++ <ClCompile Include="..\..\..\src\CoinCbc.cpp" /> ++ <ClCompile Include="..\..\..\src\CoinMP.cpp" /> ++ <ClCompile Include="..\..\..\src\CoinOption.c" /> ++ <ClCompile Include="..\..\..\src\CoinProblem.c" /> ++ <ClCompile Include="..\..\..\src\CoinResult.c" /> ++ <ClCompile Include="..\..\..\src\CoinSolver.c" /> ++ </ItemGroup> ++ <ItemGroup> ++ <None Include="..\..\..\src\CoinMP.def" /> ++ </ItemGroup> ++ <ItemGroup> ++ <ClInclude Include="..\..\..\..\Cbc\src\CbcSolver.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinCbc.h" /> ++ <ClInclude Include="..\..\..\src\CoinMP.h" /> ++ <ClInclude Include="..\..\..\src\CoinOption.h" /> ++ <ClInclude Include="..\..\..\src\CoinProblem.h" /> ++ <ClInclude Include="..\..\..\src\CoinResult.h" /> ++ <ClInclude Include="..\..\..\src\CoinSolver.h" /> ++ <ClInclude Include="resource.h" /> ++ </ItemGroup> ++ <ItemGroup> ++ <ResourceCompile Include="CoinMP.rc" /> ++ </ItemGroup> ++ <ItemGroup> ++ <ProjectReference Include="..\..\..\..\Cbc\MSVisualStudio\v9\libCbcSolver\libCbcSolver.vcxproj"> ++ <Project>{71da4595-e8a7-4b21-a00a-d96d29d11e3e}</Project> ++ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> ++ </ProjectReference> ++ <ProjectReference Include="..\..\..\..\Cbc\MSVisualStudio\v9\libCbc\libCbc.vcxproj"> ++ <Project>{363ba154-fec9-4e1e-bc23-93cec58ab785}</Project> ++ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> ++ </ProjectReference> ++ <ProjectReference Include="..\..\..\..\Cgl\MSVisualStudio\v9\libCgl\libCgl.vcxproj"> ++ <Project>{dbea3904-f0b8-408a-9e1a-6497febe8c42}</Project> ++ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> ++ </ProjectReference> ++ <ProjectReference Include="..\..\..\..\Clp\MSVisualStudio\v9\libClp\libClp.vcxproj"> ++ <Project>{4f8f7d1c-3a9e-444d-8ee9-77f33fa05994}</Project> ++ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> ++ </ProjectReference> ++ <ProjectReference Include="..\..\..\..\Clp\MSVisualStudio\v9\libOsiClp\libOsiClp.vcxproj"> ++ <Project>{02d45875-a8cf-41b9-990b-3699c0ecfe10}</Project> ++ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> ++ </ProjectReference> ++ <ProjectReference Include="..\..\..\..\CoinUtils\MSVisualStudio\v9\libCoinUtils\libCoinUtils.vcxproj"> ++ <Project>{c4867f15-438d-4ff8-8388-62fbaaa9786c}</Project> ++ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> ++ </ProjectReference> ++ <ProjectReference Include="..\..\..\..\Osi\MSVisualStudio\v9\libOsi\libOsi.vcxproj"> ++ <Project>{7d98e2cb-876e-4f75-9f71-77d3fe87e149}</Project> ++ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> ++ </ProjectReference> ++ </ItemGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> ++ <ImportGroup Label="ExtensionTargets"> ++ </ImportGroup> ++</Project> +\ No newline at end of file +diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP.sln coinmp/CoinMP/MSVisualStudio/v9/CoinMP.sln +--- coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP.sln 2014-02-28 15:32:23.168600537 +0100 ++++ coinmp/CoinMP/MSVisualStudio/v9/CoinMP.sln 2014-02-28 15:32:36.580600695 +0100 +@@ -1,35 +1,23 @@ + +-Microsoft Visual Studio Solution File, Format Version 10.00 +-# Visual Studio 2008 +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libClp", "..\..\..\Clp\MSVisualStudio\v9\libClp\libClp.vcproj", "{4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}" ++Microsoft Visual Studio Solution File, Format Version 12.00 ++# Visual Studio Express 2012 for Windows Desktop ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libClp", "..\..\..\Clp\MSVisualStudio\v9\libClp\libClp.vcxproj", "{4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCoinUtils", "..\..\..\CoinUtils\MSVisualStudio\v9\libCoinUtils\libCoinUtils.vcproj", "{C4867F15-438D-4FF8-8388-62FBAAA9786C}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCoinUtils", "..\..\..\CoinUtils\MSVisualStudio\v9\libCoinUtils\libCoinUtils.vcxproj", "{C4867F15-438D-4FF8-8388-62FBAAA9786C}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCgl", "..\..\..\Cgl\MSVisualStudio\v9\libCgl\libCgl.vcproj", "{DBEA3904-F0B8-408A-9E1A-6497FEBE8C42}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCgl", "..\..\..\Cgl\MSVisualStudio\v9\libCgl\libCgl.vcxproj", "{DBEA3904-F0B8-408A-9E1A-6497FEBE8C42}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbc", "..\..\..\Cbc\MSVisualStudio\v9\libCbc\libCbc.vcproj", "{363BA154-FEC9-4E1E-BC23-93CEC58AB785}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbc", "..\..\..\Cbc\MSVisualStudio\v9\libCbc\libCbc.vcxproj", "{363BA154-FEC9-4E1E-BC23-93CEC58AB785}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsi", "..\..\..\Osi\MSVisualStudio\v9\libOsi\libOsi.vcproj", "{7D98E2CB-876E-4F75-9F71-77D3FE87E149}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsi", "..\..\..\Osi\MSVisualStudio\v9\libOsi\libOsi.vcxproj", "{7D98E2CB-876E-4F75-9F71-77D3FE87E149}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsiClp", "..\..\..\Clp\MSVisualStudio\v9\libOsiClp\libOsiClp.vcproj", "{02D45875-A8CF-41B9-990B-3699C0ECFE10}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsiClp", "..\..\..\Clp\MSVisualStudio\v9\libOsiClp\libOsiClp.vcxproj", "{02D45875-A8CF-41B9-990B-3699C0ECFE10}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoinMP", "CoinMP\CoinMP.vcproj", "{175F0674-F0B9-479C-9C9D-76969C06D794}" +- ProjectSection(ProjectDependencies) = postProject +- {DBEA3904-F0B8-408A-9E1A-6497FEBE8C42} = {DBEA3904-F0B8-408A-9E1A-6497FEBE8C42} +- {C4867F15-438D-4FF8-8388-62FBAAA9786C} = {C4867F15-438D-4FF8-8388-62FBAAA9786C} +- {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994} = {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994} +- {363BA154-FEC9-4E1E-BC23-93CEC58AB785} = {363BA154-FEC9-4E1E-BC23-93CEC58AB785} +- {02D45875-A8CF-41B9-990B-3699C0ECFE10} = {02D45875-A8CF-41B9-990B-3699C0ECFE10} +- {71DA4595-E8A7-4B21-A00A-D96D29D11E3E} = {71DA4595-E8A7-4B21-A00A-D96D29D11E3E} +- {7D98E2CB-876E-4F75-9F71-77D3FE87E149} = {7D98E2CB-876E-4F75-9F71-77D3FE87E149} +- EndProjectSection ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoinMP", "CoinMP\CoinMP.vcxproj", "{175F0674-F0B9-479C-9C9D-76969C06D794}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unitTest", "unitTest\unitTest.vcproj", "{9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}" +- ProjectSection(ProjectDependencies) = postProject +- {175F0674-F0B9-479C-9C9D-76969C06D794} = {175F0674-F0B9-479C-9C9D-76969C06D794} +- EndProjectSection ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unitTest", "unitTest\unitTest.vcxproj", "{9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbcSolver", "..\..\..\Cbc\MSVisualStudio\v9\libCbcSolver\libCbcSolver.vcproj", "{71DA4595-E8A7-4B21-A00A-D96D29D11E3E}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbcSolver", "..\..\..\Cbc\MSVisualStudio\v9\libCbcSolver\libCbcSolver.vcxproj", "{71DA4595-E8A7-4B21-A00A-D96D29D11E3E}" + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +@@ -121,6 +123,7 @@ + {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|Win32.ActiveCfg = Debug|Win32 + {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|Win32.Build.0 = Debug|Win32 + {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|x64.ActiveCfg = Debug|x64 ++ {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|x64.Build.0 = Debug|x64 + {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Any CPU.ActiveCfg = Release|Win32 + {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Mixed Platforms.Build.0 = Release|Win32 +@@ -134,6 +137,7 @@ + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|Win32.Build.0 = Debug|Win32 + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|x64.ActiveCfg = Debug|x64 ++ {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|x64.Build.0 = Debug|x64 + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Release|Any CPU.ActiveCfg = Release|Win32 + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Release|Mixed Platforms.Build.0 = Release|Win32 +diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj +--- coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj 2014-02-28 15:32:36.564600694 +0100 +@@ -0,0 +1,188 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <ItemGroup Label="ProjectConfigurations"> ++ <ProjectConfiguration Include="Debug|Win32"> ++ <Configuration>Debug</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|x64"> ++ <Configuration>Debug</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|Win32"> ++ <Configuration>Release</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|x64"> ++ <Configuration>Release</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ </ItemGroup> ++ <PropertyGroup Label="Globals"> ++ <ProjectGuid>{9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}</ProjectGuid> ++ <RootNamespace>unitTest</RootNamespace> ++ <Keyword>Win32Proj</Keyword> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> ++ <ConfigurationType>Application</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>Unicode</CharacterSet> ++ <WholeProgramOptimization>true</WholeProgramOptimization> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> ++ <ConfigurationType>Application</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>Unicode</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> ++ <ConfigurationType>Application</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>Unicode</CharacterSet> ++ <WholeProgramOptimization>true</WholeProgramOptimization> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> ++ <ConfigurationType>Application</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <CharacterSet>Unicode</CharacterSet> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ++ <ImportGroup Label="ExtensionSettings"> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ </ImportGroup> ++ <PropertyGroup Label="UserMacros" /> ++ <PropertyGroup> ++ <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ <LinkIncremental>true</LinkIncremental> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ <LinkIncremental>false</LinkIncremental> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ <LinkIncremental>true</LinkIncremental> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ <LinkIncremental>false</LinkIncremental> ++ </PropertyGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\CoinMP\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> ++ <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> ++ </ClCompile> ++ <Link> ++ <GenerateDebugInformation>true</GenerateDebugInformation> ++ <SubSystem>Console</SubSystem> ++ <RandomizedBaseAddress>true</RandomizedBaseAddress> ++ <DataExecutionPrevention /> ++ <TargetMachine>MachineX86</TargetMachine> ++ </Link> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <ClCompile> ++ <AdditionalIncludeDirectories>..\..\..\..\CoinMP\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> ++ </ClCompile> ++ <Link> ++ <GenerateDebugInformation>true</GenerateDebugInformation> ++ <SubSystem>Console</SubSystem> ++ <OptimizeReferences>true</OptimizeReferences> ++ <EnableCOMDATFolding>true</EnableCOMDATFolding> ++ <RandomizedBaseAddress>true</RandomizedBaseAddress> ++ <DataExecutionPrevention /> ++ <TargetMachine>MachineX86</TargetMachine> ++ </Link> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\CoinMP\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> ++ </ClCompile> ++ <Link> ++ <GenerateDebugInformation>true</GenerateDebugInformation> ++ <SubSystem>Console</SubSystem> ++ <RandomizedBaseAddress>true</RandomizedBaseAddress> ++ <DataExecutionPrevention /> ++ <TargetMachine>MachineX64</TargetMachine> ++ </Link> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <AdditionalIncludeDirectories>..\..\..\..\CoinMP\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> ++ </ClCompile> ++ <Link> ++ <GenerateDebugInformation>true</GenerateDebugInformation> ++ <SubSystem>Console</SubSystem> ++ <OptimizeReferences>true</OptimizeReferences> ++ <EnableCOMDATFolding>true</EnableCOMDATFolding> ++ <RandomizedBaseAddress>true</RandomizedBaseAddress> ++ <DataExecutionPrevention /> ++ <TargetMachine>MachineX64</TargetMachine> ++ </Link> ++ </ItemDefinitionGroup> ++ <ItemGroup> ++ <ClCompile Include="..\..\..\test\unitTest.cpp" /> ++ </ItemGroup> ++ <ItemGroup> ++ <ProjectReference Include="..\CoinMP\CoinMP.vcxproj"> ++ <Project>{175f0674-f0b9-479c-9c9d-76969c06d794}</Project> ++ <ReferenceOutputAssembly>false</ReferenceOutputAssembly> ++ </ProjectReference> ++ </ItemGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> ++ <ImportGroup Label="ExtensionTargets"> ++ </ImportGroup> ++</Project> +\ No newline at end of file +diff -urN coinmp.org/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj +--- coinmp.org/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj 2014-02-28 15:32:36.564600694 +0100 +@@ -0,0 +1,650 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <ItemGroup Label="ProjectConfigurations"> ++ <ProjectConfiguration Include="Debug|Win32"> ++ <Configuration>Debug</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|x64"> ++ <Configuration>Debug</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|Win32"> ++ <Configuration>Release</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|x64"> ++ <Configuration>Release</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ </ItemGroup> ++ <PropertyGroup Label="Globals"> ++ <ProjectGuid>{C4867F15-438D-4FF8-8388-62FBAAA9786C}</ProjectGuid> ++ <RootNamespace>libCoinUtils</RootNamespace> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ++ <ImportGroup Label="ExtensionSettings"> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <PropertyGroup Label="UserMacros" /> ++ <PropertyGroup> ++ <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemGroup> ++ <ClCompile Include="..\..\..\src\CoinAlloc.cpp" /> ++ <ClCompile Include="..\..\..\src\CoinBuild.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinDenseFactorization.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinDenseVector.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinError.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinFactorization1.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinFactorization2.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinFactorization3.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinFactorization4.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinFileIO.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinFinite.cpp" /> ++ <ClCompile Include="..\..\..\src\CoinIndexedVector.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinLpIO.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinMessage.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinMessageHandler.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinModel.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinModelUseful.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinModelUseful2.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinMpsIO.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinOslFactorization.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinOslFactorization2.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinOslFactorization3.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPackedMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPackedVector.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPackedVectorBase.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinParam.cpp" /> ++ <ClCompile Include="..\..\..\src\CoinParamUtils.cpp" /> ++ <ClCompile Include="..\..\..\src\CoinPostsolveMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPrePostsolveMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveDoubleton.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveDual.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveDupcol.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveEmpty.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveFixed.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveForcing.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveHelperFunctions.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveImpliedFree.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveIsolated.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveMatrix.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolvePsdebug.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveSingleton.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveSubst.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveTighten.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveTripleton.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveUseless.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinPresolveZeros.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinSearchTree.cpp" /> ++ <ClCompile Include="..\..\..\src\CoinShallowPackedVector.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinSimpFactorization.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinSnapshot.cpp" /> ++ <ClCompile Include="..\..\..\src\CoinStructuredModel.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinWarmStartBasis.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinWarmStartDual.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinWarmStartPrimalDual.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ <ClCompile Include="..\..\..\src\CoinWarmStartVector.cpp"> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization> ++ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization> ++ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> ++ </ClCompile> ++ </ItemGroup> ++ <ItemGroup> ++ <ClInclude Include="..\..\..\src\Coin_C_defines.h" /> ++ <ClInclude Include="..\..\..\src\CoinAlloc.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinBuild.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinDenseFactorization.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinDenseVector.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinDistance.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinError.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinFactorization.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinFileIO.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinFinite.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinFloatEqual.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinHelperFunctions.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinIndexedVector.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinLpIO.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinMessage.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinMessageHandler.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinModel.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinModelUseful.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinMpsIO.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinOslC.h" /> ++ <ClInclude Include="..\..\..\src\CoinOslFactorization.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPackedMatrix.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPackedVector.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPackedVectorBase.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinParam.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPragma.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveDoubleton.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveDual.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveDupcol.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveEmpty.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveFixed.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveForcing.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveImpliedFree.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveIsolated.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveMatrix.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolvePsdebug.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveSingleton.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveSubst.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveTighten.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveTripleton.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveUseless.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinPresolveZeros.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinSearchTree.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinShallowPackedVector.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinSimpFactorization.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinSort.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinStructuredModel.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinTime.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinTypes.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinUtilsAutomake.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinUtilsConfig.h" /> ++ <ClInclude Include="..\..\..\src\CoinWarmStart.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinWarmStartBasis.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinWarmStartDual.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinWarmStartPrimalDual.hpp" /> ++ <ClInclude Include="..\..\..\src\CoinWarmStartVector.hpp" /> ++ <ClInclude Include="..\..\..\..\BuildTools\headers\configall_system.h" /> ++ <ClInclude Include="..\..\..\..\BuildTools\headers\configall_system_msc.h" /> ++ </ItemGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> ++ <ImportGroup Label="ExtensionTargets"> ++ </ImportGroup> ++</Project> +\ No newline at end of file +diff -urN coinmp.org/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj +--- coinmp.org/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj 2014-02-28 15:32:36.568600695 +0100 +@@ -0,0 +1,220 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <ItemGroup Label="ProjectConfigurations"> ++ <ProjectConfiguration Include="Debug|Win32"> ++ <Configuration>Debug</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|x64"> ++ <Configuration>Debug</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|Win32"> ++ <Configuration>Release</Configuration> ++ <Platform>Win32</Platform> ++ </ProjectConfiguration> ++ <ProjectConfiguration Include="Release|x64"> ++ <Configuration>Release</Configuration> ++ <Platform>x64</Platform> ++ </ProjectConfiguration> ++ </ItemGroup> ++ <PropertyGroup Label="Globals"> ++ <ProjectGuid>{7D98E2CB-876E-4F75-9F71-77D3FE87E149}</ProjectGuid> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> ++ <ConfigurationType>StaticLibrary</ConfigurationType> ++ <PlatformToolset>v110</PlatformToolset> ++ <UseOfMfc>false</UseOfMfc> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> ++ <ImportGroup Label="ExtensionSettings"> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> ++ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> ++ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> ++ </ImportGroup> ++ <PropertyGroup Label="UserMacros" /> ++ <PropertyGroup> ++ <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <OutDir>$(SolutionDir)$(Configuration)\</OutDir> ++ <IntDir>$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> ++ <IntDir>$(Platform)\$(Configuration)\</IntDir> ++ </PropertyGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>Disabled</Optimization> ++ <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <MinimalRebuild>true</MinimalRebuild> ++ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> ++ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> ++ <Midl> ++ <TargetEnvironment>X64</TargetEnvironment> ++ </Midl> ++ <ClCompile> ++ <Optimization>MaxSpeed</Optimization> ++ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> ++ <AdditionalIncludeDirectories>..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <StringPooling>true</StringPooling> ++ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> ++ <FunctionLevelLinking>true</FunctionLevelLinking> ++ <RuntimeTypeInfo>true</RuntimeTypeInfo> ++ <PrecompiledHeader /> ++ <WarningLevel>Level3</WarningLevel> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ <CompileAs>Default</CompileAs> ++ </ClCompile> ++ <ResourceCompile> ++ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <Culture>0x0409</Culture> ++ </ResourceCompile> ++ <Lib> ++ <SuppressStartupBanner>true</SuppressStartupBanner> ++ </Lib> ++ </ItemDefinitionGroup> ++ <ItemGroup> ++ <ClCompile Include="..\..\..\src\Osi\OsiAuxInfo.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiBranchingObject.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiChooseVariable.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiColCut.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiCut.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiCuts.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiNames.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiPresolve.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiRowCut.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiRowCutDebugger.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiSolverBranch.cpp" /> ++ <ClCompile Include="..\..\..\src\Osi\OsiSolverInterface.cpp" /> ++ </ItemGroup> ++ <ItemGroup> ++ <ClInclude Include="..\..\..\src\OsiAuxInfo.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiBranchingObject.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiChooseVariable.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiColCut.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiCollections.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiConfig.h" /> ++ <ClInclude Include="..\..\..\src\OsiCut.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiCuts.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiOpbdpSolve.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiPresolve.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiRowCut.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiRowCutDebugger.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiSolverBranch.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiSolverInterface.hpp" /> ++ <ClInclude Include="..\..\..\src\OsiSolverParameters.hpp" /> ++ </ItemGroup> ++ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> ++ <ImportGroup Label="ExtensionTargets"> ++ </ImportGroup> ++</Project> +\ No newline at end of file diff --git a/external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 b/external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 new file mode 100644 index 000000000..a764be95a --- /dev/null +++ b/external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 @@ -0,0 +1,11 @@ +--- include/cppunit/plugin/TestPlugIn.h ++++ include/cppunit/plugin/TestPlugIn.h +@@ -111,7 +111,7 @@ + /*! \brief Type of the function exported by a plug-in. + * \ingroup WritingTestPlugIn + */ +-typedef CppUnitTestPlugIn *(*TestPlugInSignature)(); ++extern "C" { typedef CppUnitTestPlugIn *(*TestPlugInSignature)(); } + + + /*! \brief Implements the function exported by the test plug-in diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk new file mode 100644 index 000000000..c0d138064 --- /dev/null +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -0,0 +1,65 @@ +# -*- 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,cppunit)) + +$(eval $(call gb_ExternalProject_register_targets,cppunit,\ + build \ +)) + +ifeq ($(OS),WNT) +$(call gb_ExternalProject_get_state_target,cppunit,build) : + $(call gb_Trace_StartRange,cppunit,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ + $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \ + $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \ + && msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \ + && cd ../DllPlugInTester \ + && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \ + ,src/cppunit) + $(call gb_Trace_EndRange,cppunit,EXTERNAL) +else + +cppunit_CXXFLAGS=$(CXXFLAGS) + +ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS))) +ifneq (,$(gb_ENABLE_DBGUTIL)) +cppunit_CXXFLAGS+=-D_GLIBCXX_DEBUG +endif +endif + +ifneq (,$(debug)) +cppunit_CXXFLAGS+=-g +endif + +$(call gb_ExternalProject_get_state_target,cppunit,build) : + $(call gb_Trace_StartRange,cppunit,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure \ + --disable-dependency-tracking \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ + --disable-doxygen \ + --disable-html-docs \ + --disable-latex-docs \ + --disable-werror \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \ + $(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ + $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \ + $(if $(filter ANDROID,$(OS)),LIBS="$(gb_STDLIBS)") \ + CXXFLAGS="$(cppunit_CXXFLAGS)" \ + && cd src \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,cppunit,EXTERNAL) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/cppunit/Makefile b/external/cppunit/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/cppunit/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/cppunit/Module_cppunit.mk b/external/cppunit/Module_cppunit.mk new file mode 100644 index 000000000..296feeb74 --- /dev/null +++ b/external/cppunit/Module_cppunit.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,cppunit)) + +$(eval $(call gb_Module_add_targets,cppunit,\ + UnpackedTarball_cppunit \ + ExternalProject_cppunit \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/cppunit/README b/external/cppunit/README new file mode 100644 index 000000000..e1d4e82a5 --- /dev/null +++ b/external/cppunit/README @@ -0,0 +1,3 @@ +C++ port of the JUnit framework for unit testing. + +From [http://www.freedesktop.org/wiki/Software/cppunit/] diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk new file mode 100644 index 000000000..24f75b434 --- /dev/null +++ b/external/cppunit/UnpackedTarball_cppunit.mk @@ -0,0 +1,29 @@ +# -*- 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,cppunit)) + +$(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,cppunit)) + +$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ + external/cppunit/windows.patch \ + external/cppunit/unix.patch \ + external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 \ + external/cppunit/enable-win32-debug.patch \ + external/cppunit/rtti.patch.0 \ +)) +ifeq ($(DISABLE_DYNLOADING),TRUE) +$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ + external/cppunit/disable-dynloading.patch \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/cppunit/disable-dynloading.patch b/external/cppunit/disable-dynloading.patch new file mode 100644 index 000000000..a9aa37f6f --- /dev/null +++ b/external/cppunit/disable-dynloading.patch @@ -0,0 +1,25 @@ +--- build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h ++++ misc/build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h +@@ -106,7 +106,9 @@ + * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void); + * \endcode + */ ++#ifndef CPPUNIT_PLUGIN_EXPORTED_NAME + #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn ++#endif + + /*! \brief Type of the function exported by a plug-in. + * \ingroup WritingTestPlugIn +@@ -143,6 +143,12 @@ + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ + typedef char __CppUnitPlugInImplementMainDummyTypeDef + ++// Actually this is for iOS and Android where we build the cppunit tests libraries ++// as plain archives and just link them statically into test fixture programs, ++// and don't want any stinking duplicate main(), but shouldn't hurt for MacOSX either. ++#elif defined(__APPLE__) || defined(__ANDROID__) ++#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ ++ typedef char __CppUnitPlugInImplementMainDummyTypeDef + // Unix + #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER) + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ diff --git a/external/cppunit/enable-win32-debug.patch b/external/cppunit/enable-win32-debug.patch new file mode 100644 index 000000000..dc159ecc5 --- /dev/null +++ b/external/cppunit/enable-win32-debug.patch @@ -0,0 +1,34 @@ +--- misc/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj ++++ misc/build/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj +@@ -107,7 +107,6 @@ + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> +- <DebugInformationFormat>OldStyle</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation> +@@ -138,6 +137,7 @@ + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <LinkDLL>true</LinkDLL> ++ <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile> + <ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary> +@@ -237,7 +237,6 @@ + <SuppressStartupBanner>true</SuppressStartupBanner> + <WarningLevel>Level3</WarningLevel> + <RuntimeTypeInfo>true</RuntimeTypeInfo> +- <DebugInformationFormat>OldStyle</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AssemblerListingLocation>.\ReleaseDll\</AssemblerListingLocation> +@@ -266,6 +266,7 @@ + <Link> + <SuppressStartupBanner>true</SuppressStartupBanner> + <LinkDLL>true</LinkDLL> ++ <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OutputFile>.\ReleaseDll\cppunit_dll.dll</OutputFile> + <ImportLibrary>.\ReleaseDll\cppunit_dll.lib</ImportLibrary> diff --git a/external/cppunit/rtti.patch.0 b/external/cppunit/rtti.patch.0 new file mode 100644 index 000000000..38d2e6a90 --- /dev/null +++ b/external/cppunit/rtti.patch.0 @@ -0,0 +1,15 @@ +--- include/cppunit/config/CppUnitApi.h ++++ include/cppunit/config/CppUnitApi.h +@@ -20,6 +20,12 @@ + #define CPPUNIT_NEED_DLL_DECL 1 + #endif + ++#elif defined __GNUC__ //TODO: actually only works for modern enough GCC ++ ++#define CPPUNIT_API __attribute__ ((visibility("default"))) ++#undef CPPUNIT_NEED_DLL_DECL ++#define CPPUNIT_NEED_DLL_DECL 0 ++ + #endif + + diff --git a/external/cppunit/unix.patch b/external/cppunit/unix.patch new file mode 100644 index 000000000..e75e72c6f --- /dev/null +++ b/external/cppunit/unix.patch @@ -0,0 +1,10 @@ +--- misc/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp ++++ misc/build/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp +@@ -20,7 +20,6 @@ + void + DynamicLibraryManager::doReleaseLibrary() + { +- ::dlclose( m_libraryHandle); + } + + diff --git a/external/cppunit/windows.patch b/external/cppunit/windows.patch new file mode 100644 index 000000000..e6ca26cbb --- /dev/null +++ b/external/cppunit/windows.patch @@ -0,0 +1,50 @@ +--- misc/cppunit-1.15.0/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:25.084658287 +0100 ++++ misc/build/cppunit-1.15.0/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:18.660706180 +0100 +@@ -133,9 +133,8 @@ + /*! \def CPPUNIT_PLUGIN_IMPLEMENT_MAIN() + * \brief Implements the 'main' function for the plug-in. + * +- * This macros implements the main() function for dynamic library. +- * For example, WIN32 requires a DllMain function, while some Unix +- * requires a main() function. This macros takes care of the implementation. ++ * This macro implements the main() function for dynamic library ++ * on Unix for some weird reason. + */ + + // Win32 +@@ -149,23 +149,7 @@ + + // Win32 + #if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER) +-#if !defined(APIENTRY) +-#define WIN32_LEAN_AND_MEAN +-#define NOGDI +-#define NOUSER +-#define NOKERNEL +-#define NOSOUND +-#ifndef NOMINMAX +-#define NOMINMAX +-#endif +-#define BLENDFUNCTION void // for mingw & gcc +-#include <windows.h> +-#endif + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ +- BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \ +- { \ +- return TRUE; \ +- } \ + typedef char __CppUnitPlugInImplementMainDummyTypeDef + + // Unix +--- misc/cppunit-1.15.0/include/cppunit/TestAssert.h ++++ misc/build/cppunit-1.15.0/include/cppunit/TestAssert.h +@@ -76,7 +76,7 @@ + const int precision = 15; + #endif // #ifdef DBL_DIG + char buffer[128]; +-#ifdef __STDC_SECURE_LIB__ // Use secure version with visual studio 2005 to avoid warning. ++#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning. + sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x); + #else + sprintf(buffer, "%.*g", precision, x); + diff --git a/external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch b/external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch new file mode 100644 index 000000000..c4fe3dcd6 --- /dev/null +++ b/external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch @@ -0,0 +1,16 @@ +diff -purN misc/description.xml misc/build/description.xml +--- misc/description.xml 2009-02-03 00:07:30.000000000 +0100 ++++ misc/build/description.xml 2010-03-05 21:38:48.000000000 +0100 +@@ -5,12 +5,4 @@ + xmlns:xlink="http://www.w3.org/1999/xlink"> + <identifier value="nl.nouenoff.ct2n"/> + <version value="1.5.0"/> +- <!-- <dependencies> +- +- </dependencies> --> +- <registration> +- <simple-license accept-by="admin" default-license-id="ID0" suppress-on-update="true" > +- <license-text xlink:href="registration/COPYING" lang="en" license-id="ID0" /> +- </simple-license> +- </registration> + </description> diff --git a/external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch b/external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch new file mode 100644 index 000000000..50dd4b5f4 --- /dev/null +++ b/external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch @@ -0,0 +1,104 @@ +diff -purN misc/Office/UI/BaseWindowState.xcu misc/build/Office/UI/BaseWindowState.xcu +--- misc/Office/UI/BaseWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/BaseWindowState.xcu 2010-03-05 21:36:37.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string"> + <value>CT2N</value> + </prop> ++ <prop oor:name="Visible" oor:type="xs:boolean"> ++ <value>false</value> ++ </prop> + </node> + </node> + </node> +diff -purN misc/Office/UI/BasicIDEWindowState.xcu misc/build/Office/UI/BasicIDEWindowState.xcu +--- misc/Office/UI/BasicIDEWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/BasicIDEWindowState.xcu 2010-03-05 21:36:46.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string"> + <value>CT2N</value> + </prop> ++ <prop oor:name="Visible" oor:type="xs:boolean"> ++ <value>false</value> ++ </prop> + </node> + </node> + </node> +diff -purN misc/Office/UI/CalcWindowState.xcu misc/build/Office/UI/CalcWindowState.xcu +--- misc/Office/UI/CalcWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/CalcWindowState.xcu 2010-03-05 21:36:32.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string"> + <value>CT2N</value> + </prop> ++ <prop oor:name="Visible" oor:type="xs:boolean"> ++ <value>false</value> ++ </prop> + </node> + </node> + </node> +diff -purN misc/Office/UI/DrawWindowState.xcu misc/build/Office/UI/DrawWindowState.xcu +--- misc/Office/UI/DrawWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/DrawWindowState.xcu 2010-03-05 21:36:54.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string"> + <value>CT2N</value> + </prop> ++ <prop oor:name="Visible" oor:type="xs:boolean"> ++ <value>false</value> ++ </prop> + </node> + </node> + </node> +diff -purN misc/Office/UI/ImpressWindowState.xcu misc/build/Office/UI/ImpressWindowState.xcu +--- misc/Office/UI/ImpressWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/ImpressWindowState.xcu 2010-03-05 21:36:59.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string"> + <value>CT2N</value> + </prop> ++ <prop oor:name="Visible" oor:type="xs:boolean"> ++ <value>false</value> ++ </prop> + </node> + </node> + </node> +diff -purN misc/Office/UI/MathWindowState.xcu misc/build/Office/UI/MathWindowState.xcu +--- misc/Office/UI/MathWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/MathWindowState.xcu 2010-03-05 21:37:03.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string"> + <value>CT2N</value> + </prop> ++ <prop oor:name="Visible" oor:type="xs:boolean"> ++ <value>false</value> ++ </prop> + </node> + </node> + </node> +diff -purN misc/Office/UI/StartModuleWindowState.xcu misc/build/Office/UI/StartModuleWindowState.xcu +--- misc/Office/UI/StartModuleWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/StartModuleWindowState.xcu 2010-03-05 21:37:09.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string"> + <value>CT2N</value> + </prop> ++ <prop oor:name="Visible" oor:type="xs:boolean"> ++ <value>false</value> ++ </prop> + </node> + </node> + </node> +diff -purN misc/Office/UI/WriterWindowState.xcu misc/build/Office/UI/WriterWindowState.xcu +--- misc/Office/UI/WriterWindowState.xcu 2008-02-09 23:26:50.000000000 +0100 ++++ misc/build/Office/UI/WriterWindowState.xcu 2010-03-05 21:37:17.000000000 +0100 +@@ -9,6 +9,9 @@ + <prop oor:name="UIName" oor:type="xs:string"> + <value>CT2N</value> + </prop> ++ <prop oor:name="Visible" oor:type="xs:boolean"> ++ <value>false</value> ++ </prop> + </node> + </node> + </node> diff --git a/external/ct2n/ConvertTextToNumber-1.5.0-add-namespace-prefix.patch b/external/ct2n/ConvertTextToNumber-1.5.0-add-namespace-prefix.patch new file mode 100644 index 000000000..8602989f7 --- /dev/null +++ b/external/ct2n/ConvertTextToNumber-1.5.0-add-namespace-prefix.patch @@ -0,0 +1,10 @@ +diff -purN misc/META-INF/manifest.xml misc/build/META-INF/manifest.xml +--- misc/META-INF/manifest.xml 2019-08-14 20:57:00.000000000 +0900 ++++ misc/build/META-INF/manifest.xml 2019-08-14 20:58:00.000000000 +0900 +@@ -1,5 +1,5 @@ + <?xml version="1.0" encoding="UTF-8"?> +-<manifest:manifest> ++<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest"> + <manifest:file-entry manifest:full-path="CT2N/" manifest:media-type="application/vnd.sun.star.basic-library"/> + <manifest:file-entry manifest:full-path="pkg-desc/pkg-description.txt" manifest:media-type="application/vnd.sun.star.package-bundle-description"/> + <manifest:file-entry manifest:full-path="Office/UI/BaseWindowState.xcu" manifest:media-type="application/vnd.sun.star.configuration-data"/> diff --git a/external/ct2n/ExternalPackage_ct2n.mk b/external/ct2n/ExternalPackage_ct2n.mk new file mode 100644 index 000000000..9a4bf2d58 --- /dev/null +++ b/external/ct2n/ExternalPackage_ct2n.mk @@ -0,0 +1,38 @@ +# -*- 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_ExternalPackage_ExternalPackage,ct2n,ct2n)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,ct2n,$(LIBO_SHARE_FOLDER)/extensions/ConvertTextToNumber,\ + Addons.xcu \ + CT2N/MainCode.xba \ + CT2N/ToClipbord.xba \ + CT2N/Language.xba \ + CT2N/dialog.xlb \ + CT2N/dlgCode.xba \ + CT2N/script.xlb \ + CT2N/dlgCT2N.xdl \ + CT2N/UserSettings.xba \ + META-INF/manifest.xml \ + Office/UI/BaseWindowState.xcu \ + Office/UI/ImpressWindowState.xcu \ + Office/UI/StartModuleWindowState.xcu \ + Office/UI/BasicIDEWindowState.xcu \ + Office/UI/CalcWindowState.xcu \ + Office/UI/WriterWindowState.xcu \ + Office/UI/DrawWindowState.xcu \ + Office/UI/MathWindowState.xcu \ + description.xml \ + icons/image1_26.bmp \ + icons/image1_16.bmp \ + pkg-desc/pkg-description.txt \ + registration/COPYING \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/ct2n/Makefile b/external/ct2n/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/ct2n/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/ct2n/Module_ct2n.mk b/external/ct2n/Module_ct2n.mk new file mode 100644 index 000000000..03f4d7b33 --- /dev/null +++ b/external/ct2n/Module_ct2n.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,ct2n)) + +$(eval $(call gb_Module_add_targets,ct2n,\ + ExternalPackage_ct2n \ + UnpackedTarball_ct2n \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/external/ct2n/README b/external/ct2n/README new file mode 100644 index 000000000..7d5d27888 --- /dev/null +++ b/external/ct2n/README @@ -0,0 +1,4 @@ +From [http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates]. + +ConvertTextToNumber replaces numbers and dates, formatted + as text, with real numbers.
\ No newline at end of file diff --git a/external/ct2n/UnpackedTarball_ct2n.mk b/external/ct2n/UnpackedTarball_ct2n.mk new file mode 100644 index 000000000..38cfb6743 --- /dev/null +++ b/external/ct2n/UnpackedTarball_ct2n.mk @@ -0,0 +1,32 @@ +# -*- 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,ct2n)) + +$(eval $(call gb_UnpackedTarball_set_tarball,ct2n,$(CT2N_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_add_patches,ct2n,\ + external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch \ + external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \ + external/ct2n/ConvertTextToNumber-1.5.0-add-namespace-prefix.patch \ +)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,ct2n,\ + description.xml \ + Office/UI/BaseWindowState.xcu \ + Office/UI/BasicIDEWindowState.xcu \ + Office/UI/CalcWindowState.xcu \ + Office/UI/DrawWindowState.xcu \ + Office/UI/ImpressWindowState.xcu \ + Office/UI/MathWindowState.xcu \ + Office/UI/StartModuleWindowState.xcu \ + Office/UI/WriterWindowState.xcu \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/ct2n/description-en-US.txt b/external/ct2n/description-en-US.txt new file mode 100644 index 000000000..a91393b5a --- /dev/null +++ b/external/ct2n/description-en-US.txt @@ -0,0 +1,4 @@ +From [http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates]. + +ConvertTextToNumber replaces numbers and dates, formatted + as text, with real numbers. diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk new file mode 100644 index 000000000..8da569e3e --- /dev/null +++ b/external/curl/ExternalPackage_curl.mk @@ -0,0 +1,28 @@ +# -*- 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_ExternalPackage_ExternalPackage,curl,curl)) + +$(eval $(call gb_ExternalPackage_use_external_project,curl,curl)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) + +ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(if $(filter X86_64,$(CPUNAME)),x64,x86)-$(if $(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/bin/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).dll)) +else ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib)) +else ifeq ($(OS),AIX) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4)) +else +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.6.0)) +endif + +endif # $(DISABLE_DYNLOADING) + +# vim: set noet sw=4 ts=4: diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk new file mode 100644 index 000000000..f6eb073f5 --- /dev/null +++ b/external/curl/ExternalProject_curl.mk @@ -0,0 +1,95 @@ +# -*- 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,curl)) + +$(eval $(call gb_ExternalProject_use_externals,curl,\ + $(if $(ENABLE_NSS),nss3) \ + zlib \ +)) + +$(eval $(call gb_ExternalProject_register_targets,curl,\ + build \ +)) + +ifneq ($(OS),WNT) + +curl_CPPFLAGS := +curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN) + +ifneq ($(OS),ANDROID) +ifneq ($(SYSBASE),) +curl_CPPFLAGS += -I$(SYSBASE)/usr/include +curl_LDFLAGS += -L$(SYSBASE)/usr/lib +endif +endif + +# there are 2 include paths, the other one is passed to --with-nss below +ifeq ($(SYSTEM_NSS),) +curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss +endif + +# use --with-darwinssl on macOS >10.5 and iOS to get a native UI for SSL certs for CMIS usage +# use --with-nss only on platforms other than macOS and iOS +$(call gb_ExternalProject_get_state_target,curl,build): + $(call gb_Trace_StartRange,curl,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure \ + $(if $(filter iOS MACOSX,$(OS)),\ + --with-darwinssl,\ + $(if $(ENABLE_NSS),--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"),--without-nss)) \ + --without-ssl --without-gnutls --without-polarssl --without-cyassl --without-axtls --without-mbedtls \ + --enable-ftp --enable-http --enable-ipv6 \ + --without-libidn2 --without-libpsl --without-librtmp \ + --without-libssh2 --without-metalink --without-nghttp2 \ + --without-libssh --without-brotli \ + --without-ngtcp2 --without-quiche \ + --disable-ares \ + --disable-dict --disable-file --disable-gopher --disable-imap \ + --disable-ldap --disable-ldaps --disable-manual --disable-pop3 \ + --disable-rtsp --disable-smb --disable-smtp --disable-telnet \ + --disable-tftp \ + $(if $(filter LINUX,$(OS)),--without-ca-bundle --without-ca-path) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ + $(if $(ENABLE_DEBUG),--enable-debug) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter MACOSX,$(OS)),CFLAGS='$(CFLAGS) \ + -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)') \ + CPPFLAGS='$(curl_CPPFLAGS)' \ + LDFLAGS='$(curl_LDFLAGS)' \ + ZLIB_CFLAGS='$(ZLIB_CFLAGS)' ZLIB_LIBS='$(ZLIB_LIBS)' \ + && cd lib \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,curl,EXTERNAL) + +else ifeq ($(COM),MSC) + +$(eval $(call gb_ExternalProject_use_nmake,curl,build)) + +$(call gb_ExternalProject_get_state_target,curl,build): + $(call gb_Trace_StartRange,curl,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + nmake -f Makefile.vc \ + mode=dll \ + VC=12 \ + $(if $(filter X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \ + GEN_PDB=$(if $(call gb_Module__symbols_enabled,curl),yes,no) \ + DEBUG=$(if $(MSVC_USE_DEBUG_RUNTIME),yes,no) \ + ENABLE_IPV6=yes \ + ENABLE_SSPI=yes \ + ENABLE_WINSSL=yes \ + ,winbuild) + $(call gb_Trace_EndRange,curl,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/curl/Makefile b/external/curl/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/curl/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/curl/Module_curl.mk b/external/curl/Module_curl.mk new file mode 100644 index 000000000..2b4c61c04 --- /dev/null +++ b/external/curl/Module_curl.mk @@ -0,0 +1,18 @@ +# -*- 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,curl)) + +$(eval $(call gb_Module_add_targets,curl,\ + UnpackedTarball_curl \ + ExternalPackage_curl \ + ExternalProject_curl \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/curl/README b/external/curl/README new file mode 100644 index 000000000..292e4edf5 --- /dev/null +++ b/external/curl/README @@ -0,0 +1 @@ +A URL manipulation engine from [http://curl.haxx.se/]. diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk new file mode 100644 index 000000000..1cdb64c0b --- /dev/null +++ b/external/curl/UnpackedTarball_curl.mk @@ -0,0 +1,39 @@ +# -*- 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,curl)) + +$(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\ + winbuild/MakefileBuild.vc \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,curl,\ + external/curl/curl-msvc.patch.1 \ + external/curl/curl-msvc-disable-protocols.patch.1 \ + external/curl/curl-7.26.0_win-proxy.patch \ + external/curl/zlib.patch.0 \ +)) + +ifeq ($(SYSTEM_NSS),) +$(eval $(call gb_UnpackedTarball_add_patches,curl,\ + external/curl/curl-nss.patch.1 \ +)) +endif + +ifeq ($(OS)-$(COM_IS_CLANG),WNT-TRUE) +$(eval $(call gb_UnpackedTarball_add_patches,curl, \ + external/curl/clang-cl.patch.0 \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/curl/clang-cl.patch.0 b/external/curl/clang-cl.patch.0 new file mode 100644 index 000000000..2fbb10c2a --- /dev/null +++ b/external/curl/clang-cl.patch.0 @@ -0,0 +1,11 @@ +--- winbuild/MakefileBuild.vc ++++ winbuild/MakefileBuild.vc +@@ -60,7 +60,7 @@ + !ELSE + CC_NODEBUG = $(CC) /O2 /DNDEBUG + CC_DEBUG = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd +-CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC) ++CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /c /DBUILDING_LIBCURL $(SOLARINC) + !ENDIF + + LFLAGS = /nologo /machine:$(MACHINE) diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch new file mode 100644 index 000000000..852881570 --- /dev/null +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -0,0 +1,121 @@ +--- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 17:15:22.969492548 +0200 ++++ curl/winbuild/MakefileBuild.vc 2017-10-23 17:16:38.491490679 +0200 +@@ -72,7 +72,7 @@ + + CFLAGS_LIBCURL_STATIC = /DCURL_STATICLIB + +-WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib crypt32.lib ++WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib crypt32.lib winhttp.lib + + BASE_NAME = libcurl + BASE_NAME_DEBUG = $(BASE_NAME)_debug +--- curl-7.26.0/lib/url.c ++++ misc/build/curl-7.26.0/lib/url.c +@@ -78,6 +78,10 @@ + bool curl_win32_idn_to_ascii(const char *in, char **out); + #endif /* USE_LIBIDN2 */ + ++#ifdef _WIN32 ++#include <WinHttp.h> ++#endif ++ + #include "urldata.h" + #include "netrc.h" + +@@ -4586,6 +4590,21 @@ + } + + #ifndef CURL_DISABLE_HTTP ++#ifdef _WIN32 ++static char *wstrToCstr(LPWSTR wStr) ++{ ++ int bufSize; ++ char *out = NULL; ++ if(wStr != NULL) { ++ bufSize = WideCharToMultiByte( ++ CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL); ++ out = (char *)malloc(bufSize * sizeof(char)); ++ WideCharToMultiByte(CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL); ++ } ++ return out; ++} ++#endif ++ + /**************************************************************** + * Detect what (if any) proxy to use. Remember that this selects a host + * name and is not limited to HTTP proxies only. +@@ -4613,6 +4633,66 @@ + * For compatibility, the all-uppercase versions of these variables are + * checked if the lowercase versions don't exist. + */ ++#ifdef _WIN32 ++ char *no_proxy = NULL; ++ WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig; ++ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *) ++ malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG)); ++ if(WinHttpGetIEProxyConfigForCurrentUser(ieProxyConfig)) { ++ if(!ieProxyConfig->fAutoDetect) { ++ char *ieProxy; ++ char *ieNoProxy; ++ char *pos; ++ ++ ieProxy = wstrToCstr(ieProxyConfig->lpszProxy); ++ ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass); ++ ++ /* Convert the ieNoProxy into a proper no_proxy value */ ++ if(NULL != ieNoProxy) { ++ no_proxy = strdup(ieNoProxy); ++ pos = strpbrk(no_proxy, "; "); ++ while(NULL != pos) { ++ no_proxy[pos-no_proxy] = ','; ++ pos = strpbrk(no_proxy, "; "); ++ } ++ } ++ ++ if(!check_noproxy(conn->host.name, no_proxy)) { ++ /* Look for the http proxy setting */ ++ char *tok; ++ char *saveptr; ++ ++ if(NULL != ieProxy) { ++ tok = strtok_s(ieProxy, ";", &saveptr); ++ if(strchr(tok, '=') == NULL) { ++ proxy = strdup(ieProxy); ++ } ++ else { ++ do { ++ if(strncmp(tok, "http=", 5) == 0) { ++ /* We found HTTP proxy value, then use it */ ++ proxy = strdup(tok + 5); ++ } ++ tok = strtok_s(NULL, ";", &saveptr); ++ } ++ while(NULL != tok); ++ } ++ } ++ } ++ ++ free(ieProxy); ++ free(ieNoProxy); ++ } ++ else { ++ /* TODO Handle the Proxy config Auto Detection case */ ++ } ++ ++ GlobalFree(ieProxyConfig->lpszAutoConfigUrl); ++ GlobalFree(ieProxyConfig->lpszProxy); ++ GlobalFree(ieProxyConfig->lpszProxyBypass); ++ } ++ free(no_proxy); ++#else /* !_WIN32 */ + char proxy_env[128]; + const char *protop = conn->handler->scheme; + char *envp = proxy_env; +@@ -4663,6 +4739,7 @@ + } + if(proxy) + infof(conn->data, "Uses proxy env variable %s == '%s'\n", envp, proxy); ++#endif /* _WIN32 */ + + return proxy; + } diff --git a/external/curl/curl-msvc-disable-protocols.patch.1 b/external/curl/curl-msvc-disable-protocols.patch.1 new file mode 100644 index 000000000..c8747a5fc --- /dev/null +++ b/external/curl/curl-msvc-disable-protocols.patch.1 @@ -0,0 +1,35 @@ +disable protocols nobody needs in MSVC build + +--- curl/lib/config-win32.h.orig 2017-08-09 16:43:29.464000000 +0200 ++++ curl/lib/config-win32.h 2017-08-09 16:47:38.549200000 +0200 +@@ -733,4 +733,19 @@ + # define ENABLE_IPV6 1 + #endif + ++#define CURL_DISABLE_DICT 1 ++#define CURL_DISABLE_FILE 1 ++//#undef CURL_DISABLE_FTP ++#define CURL_DISABLE_GOPHER 1 ++//#undef CURL_DISABLE_HTTP ++#define CURL_DISABLE_IMAP 1 ++#define CURL_DISABLE_LDAP 1 ++#define CURL_DISABLE_LDAPS 1 ++#define CURL_DISABLE_POP3 1 ++#define CURL_DISABLE_RTSP 1 ++#define CURL_DISABLE_SMB 1 ++#define CURL_DISABLE_SMTP 1 ++#define CURL_DISABLE_TELNET 1 ++#define CURL_DISABLE_TFTP 1 ++ + #endif /* HEADER_CURL_CONFIG_WIN32_H */ +--- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 23:41:21.393200000 +0200 ++++ curl/winbuild/MakefileBuild.vc 2017-10-23 23:34:16.028000000 +0200 +@@ -431,7 +431,7 @@ + + EXE_OBJS = $(CURL_OBJS) $(CURL_DIROBJ)\curl.res + +-all : $(TARGET) $(PROGRAM_NAME) ++all : $(TARGET) + + package: $(TARGET) + @cd $(DIRDIST) diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 new file mode 100644 index 000000000..a5b79a8e9 --- /dev/null +++ b/external/curl/curl-msvc.patch.1 @@ -0,0 +1,27 @@ +MSVC: using SOLARINC + +--- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 16:36:07.713550851 +0200 ++++ curl/winbuild/MakefileBuild.vc 2017-10-23 16:38:19.301547594 +0200 +@@ -60,7 +60,7 @@ + !ELSE + CC_NODEBUG = $(CC) /O2 /DNDEBUG + CC_DEBUG = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd +-CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL ++CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC) + !ENDIF + + LFLAGS = /nologo /machine:$(MACHINE) +@@ -300,11 +300,11 @@ + # CURL_XX macros are for the curl.exe command + + !IF "$(DEBUG)"=="yes" +-RC_FLAGS = /dDEBUGBUILD=1 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc ++RC_FLAGS = $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc + CURL_CC = $(CC_DEBUG) $(RTLIB_DEBUG) + CURL_RC_FLAGS = $(CURL_RC_FLAGS) /i../include /dDEBUGBUILD=1 /Fo $@ $(CURL_SRC_DIR)\curl.rc + !ELSE +-RC_FLAGS = /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc ++RC_FLAGS = $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc + CURL_CC = $(CC_NODEBUG) $(RTLIB) + CURL_RC_FLAGS = $(CURL_RC_FLAGS) /i../include /dDEBUGBUILD=0 /Fo $@ $(CURL_SRC_DIR)\curl.rc + !ENDIF diff --git a/external/curl/curl-nss.patch.1 b/external/curl/curl-nss.patch.1 new file mode 100644 index 000000000..69fde5f7f --- /dev/null +++ b/external/curl/curl-nss.patch.1 @@ -0,0 +1,12 @@ +diff -ur curl.org/configure curl/configure +--- curl.org/configure 2016-03-13 15:14:07.177000076 +0100 ++++ curl/configure 2016-03-13 15:16:44.132000076 +0100 +@@ -24009,7 +24009,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using hard-wired libraries and compilation flags for NSS." >&5 + $as_echo "$as_me: WARNING: Using hard-wired libraries and compilation flags for NSS." >&2;} + addld="-L$OPT_NSS/lib" +- addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4" ++ addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lnssutil3" + addcflags="-I$OPT_NSS/include" + version="unknown" + nssprefix=$OPT_NSS diff --git a/external/curl/zlib.patch.0 b/external/curl/zlib.patch.0 new file mode 100644 index 000000000..189e820d1 --- /dev/null +++ b/external/curl/zlib.patch.0 @@ -0,0 +1,90 @@ +--- configure ++++ configure +@@ -20709,7 +20709,6 @@ + clean_CPPFLAGS=$CPPFLAGS + clean_LDFLAGS=$LDFLAGS + clean_LIBS=$LIBS +-ZLIB_LIBS="" + + # Check whether --with-zlib was given. + if test "${with_zlib+set}" = set; then : +@@ -20718,6 +20719,7 @@ + + + if test "$OPT_ZLIB" = "no" ; then ++ ZLIB_LIBS="" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5 + $as_echo "$as_me: WARNING: zlib disabled" >&2;} + else +@@ -20725,6 +20725,21 @@ + OPT_ZLIB="" + fi + ++ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then ++ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS" ++ LIBS="$ZLIB_LIBS $LIBS" ++ HAVE_LIBZ="1" ++ ++ ++$as_echo "#define HAVE_ZLIB_H 1" >>confdefs.h ++ ++ ++$as_echo "#define HAVE_LIBZ 1" >>confdefs.h ++ ++ AMFIXLIB="1" ++ else ++ ZLIB_LIBS="" ++ + if test -z "$OPT_ZLIB" ; then + + if test -n "$PKG_CONFIG"; then +@@ -21005,6 +21020,7 @@ + $as_echo "$as_me: found both libz and libz.h header" >&6;} + curl_zlib_msg="enabled" + fi ++ fi + fi + + if test x"$AMFIXLIB" = x1; then +--- configure.ac ++++ configure.ac +@@ -880,19 +880,30 @@ + clean_CPPFLAGS=$CPPFLAGS + clean_LDFLAGS=$LDFLAGS + clean_LIBS=$LIBS +-ZLIB_LIBS="" + AC_ARG_WITH(zlib, + AC_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH]) + AC_HELP_STRING([--without-zlib],[disable use of zlib]), + [OPT_ZLIB="$withval"]) + + if test "$OPT_ZLIB" = "no" ; then ++ ZLIB_LIBS="" + AC_MSG_WARN([zlib disabled]) + else + if test "$OPT_ZLIB" = "yes" ; then + OPT_ZLIB="" + fi + ++ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then ++ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS" ++ LIBS="$ZLIB_LIBS $LIBS" ++ HAVE_LIBZ="1" ++ AC_SUBST(HAVE_LIBZ) ++ AC_DEFINE(HAVE_ZLIB_H, 1, [if you have the zlib.h header file]) ++ AC_DEFINE(HAVE_LIBZ, 1, [if zlib is available]) ++ AMFIXLIB="1" ++ else ++ ZLIB_LIBS="" ++ + if test -z "$OPT_ZLIB" ; then + CURL_CHECK_PKGCONFIG(zlib) + +@@ -975,6 +986,7 @@ + AC_MSG_NOTICE([found both libz and libz.h header]) + curl_zlib_msg="enabled" + fi ++ fi + fi + + dnl set variable for use in automakefile(s) diff --git a/external/dtoa/Makefile b/external/dtoa/Makefile new file mode 100644 index 000000000..6427d44e3 --- /dev/null +++ b/external/dtoa/Makefile @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*- +# +# 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/. +# + +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/dtoa/Module_dtoa.mk b/external/dtoa/Module_dtoa.mk new file mode 100644 index 000000000..c652f97e0 --- /dev/null +++ b/external/dtoa/Module_dtoa.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,dtoa)) + +$(eval $(call gb_Module_add_targets,dtoa,\ + UnpackedTarball_dtoa \ + StaticLibrary_dtoa \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/dtoa/README b/external/dtoa/README new file mode 100644 index 000000000..9f46b9865 --- /dev/null +++ b/external/dtoa/README @@ -0,0 +1,10 @@ +dtoa is available from [ https://www.netlib.org/fp/ ]. + +Used to convert a decimal string to double (until std::from_chars is available on used compilers). +Packaged using + + mkdir dtoa && mkdir dtoa/src && wget https://www.netlib.org/fp/dtoa.c -O dtoa/src/dtoa.c && \ + printf 'd8bab255476f39ea495c8c8ed164f9077da926e6ca7afb9ad3c56d337c4484fe dtoa/src/dtoa.c' | sha256sum -c && \ + tar -c --owner=0 --group=0 --mode=go=r,u=rw --mtime='Wed, 11 Apr 2018 15:59:39 GMT' dtoa/src/dtoa.c | gzip -n > dtoa-20180411.tgz && \ + printf '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 dtoa-20180411.tgz' | sha256sum -c +(where the date "Wed, 11 Apr 2018 15:59:39 GMT" is from `wget -S https://www.netlib.org/fp/dtoa.c` "Last-Modified: Wed, 11 Apr 2018 15:59:39 GMT" header). diff --git a/external/dtoa/StaticLibrary_dtoa.mk b/external/dtoa/StaticLibrary_dtoa.mk new file mode 100644 index 000000000..09f4231a2 --- /dev/null +++ b/external/dtoa/StaticLibrary_dtoa.mk @@ -0,0 +1,30 @@ +# -*- 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_StaticLibrary_StaticLibrary,dtoa)) + +$(eval $(call gb_StaticLibrary_use_unpacked,dtoa,dtoa)) + +# A place that duplicates these settings is jurt/Library_jpipe.mk +$(eval $(call gb_StaticLibrary_add_defs,dtoa,\ + $(if $(filter little,$(ENDIANNESS)),-DIEEE_8087,-DIEEE_MC68k)\ +)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,dtoa)) + +$(eval $(call gb_StaticLibrary_set_include,dtoa,\ + -I$(call gb_UnpackedTarball_get_dir,dtoa/src/)\ + $$(INCLUDE)\ +)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,dtoa,\ + external/dtoa/source/dtoa \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/dtoa/UnpackedTarball_dtoa.mk b/external/dtoa/UnpackedTarball_dtoa.mk new file mode 100644 index 000000000..bc4fe55b5 --- /dev/null +++ b/external/dtoa/UnpackedTarball_dtoa.mk @@ -0,0 +1,22 @@ +#-*- 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,dtoa)) + +$(eval $(call gb_UnpackedTarball_set_tarball,dtoa,$(DTOA_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,dtoa,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,dtoa, \ + external/dtoa/include_header.patch \ + external/dtoa/coverity.patch \ + external/dtoa/ubsan.patch.0 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/dtoa/coverity.patch b/external/dtoa/coverity.patch new file mode 100644 index 000000000..8fb176531 --- /dev/null +++ b/external/dtoa/coverity.patch @@ -0,0 +1,51 @@ +--- dtor/src/dtoa.c.coverity ++++ dtor/src/dtoa.c +@@ -216,14 +216,14 @@ + typedef unsigned Long ULong; + #endif + +-#ifdef DEBUG + #include <assert.h> ++ ++#ifdef DEBUG + #include "stdio.h" + #define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);} + #define Debug(x) x + int dtoa_stats[7]; /* strtod_{64,96,bigcomp},dtoa_{exact,64,96,bigcomp} */ + #else +-#define assert(x) /*nothing*/ + #define Debug(x) /*nothing*/ + #endif + +@@ -2301,6 +2301,7 @@ + if ((y = d1)) { + if ((k = lo0bits(&y))) { + x[0] = y | z << (32 - k); ++ assert(k < 32); /* https://bugs.python.org/issue23999 */ + z >>= k; + } + else +@@ -3029,6 +3030,7 @@ + || ((n = nbits & kmask) !=0 + && hi0bits(x[k-1]) < 32-n)) { + rshift(b,1); ++ /* coverity[dead_error_line] - not worth investigating */ + if (++e > Emax) + goto ovfl; + } +@@ -3345,6 +3347,7 @@ + if ((dd = s0[j++] - '0' - dig)) + goto ret; + if (!b->x[0] && b->wds == 1) { ++ /* coverity[copy_paste_error : FALSE] */ + if (i < nd) + dd = 1; + goto ret; +@@ -3607,6 +3610,7 @@ + switch(c = *++s) { + case '-': + esign = 1; ++ /* fall through */ + case '+': + c = *++s; + } diff --git a/external/dtoa/include_header.patch b/external/dtoa/include_header.patch new file mode 100644 index 000000000..7cf0a8a21 --- /dev/null +++ b/external/dtoa/include_header.patch @@ -0,0 +1,100 @@ +--- /dev/null ++++ dtoa/include/dtoa.h +@@ -0,0 +1,1 @@ ++extern "C" double strtod_nolocale(const char *s00, char **se); +--- dtoa/src/dtoa.c.orig ++++ dtoa/src/dtoa.c +@@ -268,7 +268,7 @@ #ifndef PRIVATE_MEM + #define PRIVATE_MEM 2304 + #endif + #define PRIVATE_mem ((PRIVATE_MEM+sizeof(double)-1)/sizeof(double)) +-static double private_mem[PRIVATE_mem], *pmem_next = private_mem; ++static thread_local double private_mem[PRIVATE_mem], *pmem_next = private_mem; + #endif + + #undef IEEE_Arith +@@ -1502,9 +1502,7 @@ static unsigned int maxthreads = 0; + #define Kmax 7 + + #ifdef __cplusplus +-extern "C" double strtod(const char *s00, char **se); +-extern "C" char *dtoa(double d, int mode, int ndigits, +- int *decpt, int *sign, char **rve); ++extern "C" double strtod_nolocale(const char *s00, char **se); + #endif + + struct +@@ -1521,7 +1519,7 @@ ThInfo { + Bigint *P5s; + } ThInfo; + +- static ThInfo TI0; ++ static thread_local ThInfo TI0; + + #ifdef MULTIPLE_THREADS + static ThInfo *TI1; +@@ -1529,7 +1527,7 @@ #ifdef MULTIPLE_THREADS + static ThInfo *TI1; + static int TI0_used; + +- void ++ static void + set_max_dtoa_threads(unsigned int n) + { + size_t L; +@@ -2717,7 +2715,7 @@ enum { /* rounding values: same as FLT_ROUNDS */ + Round_down = 3 + }; + +- void ++ static void + gethex( const char **sp, U *rvp, int rounding, int sign MTd) + { + Bigint *b; +@@ -3429,7 +3427,7 @@ retlow1: + #endif /* NO_STRTOD_BIGCOMP */ + + double +-strtod(const char *s00, char **se) ++strtod_nolocale(const char *s00, char **se) + { + int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1; + int esign, i, j, k, nd, nd0, nf, nz, nz0, nz1, sign; +@@ -4851,7 +4849,7 @@ strtod_nolocale(const char *s00, char **se) + } + + #ifndef MULTIPLE_THREADS +- static char *dtoa_result; ++ static thread_local char *dtoa_result; + #endif + + static char * +@@ -4902,7 +4900,7 @@ nrv_alloc(const char *s, char *s0, size_t s0len, char **rve, int n MTd) + * when MULTIPLE_THREADS is not defined. + */ + +- void ++ static void + freedtoa(char *s) + { + #ifdef MULTIPLE_THREADS +@@ -4951,7 +4949,7 @@ freedtoa(char *s) + * calculation. + */ + +- char * ++ static char * + dtoa_r(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve, char *buf, size_t blen) + { + /* Arguments ndigits, decpt, sign are similar to those +@@ -6184,8 +6182,8 @@ dtoa_r(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve, char + return buf; + } + +- char * +-dtoa(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve) ++ static char * ++dtoa_nolocale(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve) + { + /* Sufficient space is allocated to the return value + to hold the suppressed trailing zeros. diff --git a/external/dtoa/source/dtoa.cxx b/external/dtoa/source/dtoa.cxx new file mode 100644 index 000000000..d3c8b8211 --- /dev/null +++ b/external/dtoa/source/dtoa.cxx @@ -0,0 +1,15 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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/. + */ + +#include <sal/config.h> + +// build this as C++ code, to allow e.g. thread_local keyword in MSVC +#include <dtoa.c> + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/external/dtoa/ubsan.patch.0 b/external/dtoa/ubsan.patch.0 new file mode 100644 index 000000000..de39d41ac --- /dev/null +++ b/external/dtoa/ubsan.patch.0 @@ -0,0 +1,11 @@ +--- src/dtoa.c ++++ src/dtoa.c +@@ -3618,7 +3618,7 @@ + while(c == '0') + c = *++s; + if (c > '0' && c <= '9') { +- L = c - '0'; ++ ULong L = c - '0'; + s1 = s; + while((c = *++s) >= '0' && c <= '9') + L = 10*L + c - '0'; diff --git a/external/epm/ExternalProject_epm.mk b/external/epm/ExternalProject_epm.mk new file mode 100644 index 000000000..68a61a78a --- /dev/null +++ b/external/epm/ExternalProject_epm.mk @@ -0,0 +1,26 @@ +# -*- 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,epm)) + +$(eval $(call gb_ExternalProject_register_targets,epm,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,epm,build) : + $(call gb_Trace_StartRange,epm,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure --disable-fltk \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \ + && $(MAKE) \ + && touch $@ \ + ) + $(call gb_Trace_EndRange,epm,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/epm/Makefile b/external/epm/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/epm/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/epm/Module_epm.mk b/external/epm/Module_epm.mk new file mode 100644 index 000000000..179537c6b --- /dev/null +++ b/external/epm/Module_epm.mk @@ -0,0 +1,21 @@ +# -*- 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,epm)) + +ifeq ($(CROSS_COMPILING),) + +$(eval $(call gb_Module_add_targets,epm,\ + ExternalProject_epm \ + UnpackedTarball_epm \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/epm/README b/external/epm/README new file mode 100644 index 000000000..c3ec2986e --- /dev/null +++ b/external/epm/README @@ -0,0 +1,3 @@ +Enhanced Package Manager, From [http://freshmeat.net/projects/epm] + +Nasty hack for packaging, not useful, but default build uses, every linux packager disables this. diff --git a/external/epm/UnpackedTarball_epm.mk b/external/epm/UnpackedTarball_epm.mk new file mode 100644 index 000000000..c064a5bac --- /dev/null +++ b/external/epm/UnpackedTarball_epm.mk @@ -0,0 +1,19 @@ +# -*- 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,epm)) + +$(eval $(call gb_UnpackedTarball_set_tarball,epm,$(EPM_TARBALL),,epm)) + +$(eval $(call gb_UnpackedTarball_add_patches,epm,\ + external/epm/epm-3.7.patch \ + external/epm/asan.patch.0 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/epm/asan.patch.0 b/external/epm/asan.patch.0 new file mode 100644 index 000000000..b17ac26be --- /dev/null +++ b/external/epm/asan.patch.0 @@ -0,0 +1,16 @@ +--- dist.c ++++ dist.c +@@ -405,7 +405,12 @@ + for (temp = platform->machine; *temp != '\0'; temp ++) + if (*temp == '-' || *temp == '_') + { +- strcpy(temp, temp + 1); ++ char * t2 = temp; ++ for (;; ++t2) { ++ char c = t2[1]; ++ t2[0] = c; ++ if (c == '\0') break; ++ } + temp --; + } + else diff --git a/external/epm/epm-3.7.patch b/external/epm/epm-3.7.patch new file mode 100644 index 000000000..167490121 --- /dev/null +++ b/external/epm/epm-3.7.patch @@ -0,0 +1,666 @@ +diff -urN epm-3.7-old//bsd.c epm-3.7/bsd.c +--- misc/epm-3.7/bsd.c 2003-01-14 17:05:01.000000000 +0000 ++++ misc/build/epm-3.7/bsd.c 2010-04-19 22:52:32.000000000 +0000 +@@ -26,6 +26,13 @@ + + #include "epm.h" + ++void cr2semicolon(char *command) ++{ ++ int len, i; ++ len=strlen(command); ++ for (i=0;i<len;i++) ++ if(*(command+i)=='\n') *(command+i)=';'; ++} + + /* + * 'make_bsd()' - Make a FreeBSD software distribution package. +@@ -149,8 +156,17 @@ + + for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) + { ++#ifdef __FreeBSD__ ++ if (d->type == DEPEND_REQUIRES) { ++ if (dist->relnumber) ++ fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname); ++ else ++ fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ } ++#else + if (d->type == DEPEND_REQUIRES) + fprintf(fp, "@pkgdep %s", d->product); ++#endif + else + #ifdef __FreeBSD__ + /* +@@ -179,9 +195,11 @@ + " by the BSD packager.\n", stderr); + break; + case COMMAND_POST_INSTALL : ++ cr2semicolon(c->command); + fprintf(fp, "@exec %s\n", c->command); + break; + case COMMAND_PRE_REMOVE : ++ cr2semicolon(c->command); + fprintf(fp, "@unexec %s\n", c->command); + break; + case COMMAND_POST_REMOVE : +@@ -199,7 +217,7 @@ + */ + + fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); +- fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group, ++ fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group, + file->dst); + fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); + } +@@ -326,12 +344,13 @@ + if (Verbosity) + puts("Building FreeBSD pkg binary distribution..."); + +- if (run_command(NULL, "pkg_create -p / -s %s -c %s -d %s -f %s %s", ++ if (run_command(NULL, "/usr/sbin/pkg_create -p / -s %s -c %s -d %s -f %s %s", + current, commentname, descrname, plistname, name)) + return (1); + +- if (run_command(NULL, "mv %s.tgz %s", name, directory)) +- return (1); ++ if (run_command(NULL, "mv %s.tbz %s", name, directory)) ++ if (run_command(NULL, "mv %s.tgz %s", name, directory)) ++ return (1); + + /* + * Remove temporary files... +diff -urN epm-3.7-old//configure epm-3.7/configure +--- misc/epm-3.7/configure 2003-07-24 01:20:54.000000000 +0000 ++++ misc/build/epm-3.7/configure 2010-04-19 22:52:32.000000000 +0000 +@@ -1238,6 +1238,11 @@ + fi + fi; + ++# Check whether --enable-fltk or --disable-fltk was given. ++if test "${enable_fltk+set}" = set; then ++ enableval="$enable_fltk" ++fi; ++ + + # Check whether --with-docdir or --without-docdir was given. + if test "${with_docdir+set}" = set; then +@@ -4904,36 +4909,38 @@ + fi + + +-# Extract the first word of "fltk-config", so it can be a program name with args. +-set dummy fltk-config; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_FLTKCONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $FLTKCONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_FLTKCONFIG="$FLTKCONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_FLTKCONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 ++if eval "test x$enable_fltk = xyes"; then ++ # Extract the first word of "fltk-config", so it can be a program name with args. ++ set dummy fltk-config; ac_word=$2 ++ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++ if test "${ac_cv_path_FLTKCONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ else ++ case $FLTKCONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_FLTKCONFIG="$FLTKCONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ for as_dir in $PATH ++ do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_FLTKCONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++ done ++ done ++ ++ ;; ++ esac + fi +-done +-done +- +- ;; +-esac ++ FLTKCONFIG=$ac_cv_path_FLTKCONFIG + fi +-FLTKCONFIG=$ac_cv_path_FLTKCONFIG + + if test -n "$FLTKCONFIG"; then + echo "$as_me:$LINENO: result: $FLTKCONFIG" >&5 +@@ -4950,8 +4957,10 @@ + INSTALL_GUIS="" + INSTALL_OSX="" + ++if eval "test x$enable_fltk = xyes"; then + { echo "$as_me:$LINENO: WARNING: Sorry, setup GUI requires FLTK 1.1.x." >&5 + echo "$as_me: WARNING: Sorry, setup GUI requires FLTK 1.1.x." >&2;} ++fi + else + CXXFLAGS="`$FLTKCONFIG --cflags` ${CXXFLAGS}" + GUIS="setup uninst" +diff -urN epm-3.7-old//deb.c epm-3.7/deb.c +--- misc/epm-3.7/deb.c 2003-01-15 14:29:24.000000000 +0000 ++++ misc/build/epm-3.7/deb.c 2010-04-19 22:53:34.000000000 +0000 +@@ -26,6 +26,28 @@ + + #include "epm.h" + ++/* ++ * 'add_size()' - Append Installed-Size tag to DEBIAN/control file ++ */ ++ ++int /* O - 0 = success, 1 = fail */ ++add_size(FILE *fpControl, /* Control file stream */ ++ const char *directory) /* Directory containing all files to package */ ++{ ++ FILE *fp; ++ char command[1024]; ++ ++ snprintf(command, sizeof(command), "du -k -s %s", directory); ++ fp = popen(command, "r"); ++ if( NULL != fp ) ++ { ++ char size[1024]; ++ fscanf(fp, "%s .", size); ++ fprintf(fpControl, "Installed-Size: %s\n", size); ++ return pclose(fp); ++ } ++ return 1; ++} + + /* + * 'make_deb()' - Make a Debian software distribution package. +@@ -61,18 +83,37 @@ + if (Verbosity) + puts("Creating Debian distribution..."); + ++ /* ++ * Use debian default naming scheme ++ */ ++ ++ if (!strcmp(platform->machine, "intel")) ++#ifdef __FreeBSD_kernel__ ++ platname = "kfreebsd-i386"; ++#else ++ platname = "i386"; ++#endif ++ else if (!strcmp(platform->machine, "x86_64")) ++#ifdef __FreeBSD_kernel__ ++ platname = "kfreebsd-amd64"; ++#else ++ platname = "amd64"; ++#endif ++ else if (!strcmp(platform->machine, "ppc")) ++ platname = "powerpc"; ++ + if (dist->relnumber) + { + if (platname[0]) +- snprintf(name, sizeof(name), "%s-%s-%d-%s", prodname, dist->version, dist->relnumber, ++ snprintf(name, sizeof(name), "%s_%s-%d_%s", prodname, dist->version, dist->relnumber, + platname); + else +- snprintf(name, sizeof(name), "%s-%s-%d", prodname, dist->version, dist->relnumber); ++ snprintf(name, sizeof(name), "%s_%s-%d", prodname, dist->version, dist->relnumber); + } + else if (platname[0]) +- snprintf(name, sizeof(name), "%s-%s-%s", prodname, dist->version, platname); ++ snprintf(name, sizeof(name), "%s_%s_%s", prodname, dist->version, platname); + else +- snprintf(name, sizeof(name), "%s-%s", prodname, dist->version); ++ snprintf(name, sizeof(name), "%s_%s", prodname, dist->version); + + /* + * Write the control file for DPKG... +@@ -108,8 +141,20 @@ + * (which we change in get_platform to a common name) + */ + +- if (strcmp(platform->machine, "intel") == 0) ++ if (!strcmp(platform->machine, "intel")) ++#ifdef __FreeBSD_kernel__ ++ fputs("Architecture: kfreebsd-i386\n", fp); ++#else + fputs("Architecture: i386\n", fp); ++#endif ++ else if (!strcmp(platform->machine, "x86_64")) ++#ifdef __FreeBSD_kernel__ ++ fputs("Architecture: kfreebsd-amd64\n", fp); ++#else ++ fputs("Architecture: amd64\n", fp); ++#endif ++ else if (!strcmp(platform->machine, "ppc")) ++ fputs("Architecture: powerpc\n", fp); + else + fprintf(fp, "Architecture: %s\n", platform->machine); + +@@ -139,7 +192,7 @@ + else + { + if (d->vernumber[1] < INT_MAX) +- fprintf(fp, " (>= %s, <= %s)", d->version[0], d->version[1]); ++ fprintf(fp, " (>= %s), %s (<= %s)", d->version[0], d->product, d->version[1]); + else + fprintf(fp, " (>= %s)", d->version[0]); + } +@@ -148,9 +193,9 @@ + putc('\n', fp); + } + } +- ++ + fclose(fp); +- ++ + /* + * Write the preinst file for DPKG... + */ +@@ -417,6 +462,27 @@ + } + } + ++ ++ /* ++ * Calculate and append Installed-Size to DEBIAN/control ++ */ ++ ++ if (Verbosity) ++ puts("Calculating Installed-Size..."); ++ ++ snprintf(filename, sizeof(filename), "%s/%s/DEBIAN/control", directory, name); ++ if ((fp = fopen(filename, "a")) == NULL) ++ { ++ fprintf(stderr, "epm: Unable to Installed-Size to file \"%s\" - %s\n", filename, ++ strerror(errno)); ++ return (1); ++ } ++ ++ snprintf(filename, sizeof(filename), "%s/%s", directory, name); ++ add_size(fp, filename); ++ fclose(fp); ++ ++ + /* + * Build the distribution from the spec file... + */ +diff -urN epm-3.7-old//dist.c epm-3.7/dist.c +--- misc/epm-3.7/dist.c 2003-08-07 14:14:40.000000000 +0000 ++++ misc/build/epm-3.7/dist.c 2010-04-19 22:52:32.000000000 +0000 +@@ -394,8 +394,13 @@ + strcpy(platform->machine, "mips"); + #elif defined(__hpux) + strcpy(platform->machine, "hppa"); +-#elif defined(_AIX) || defined(__APPLE__) ++#elif defined(_AIX) + strcpy(platform->machine, "powerpc"); ++#elif defined(__APPLE__) ++ if (strstr(platform->machine, "86") != NULL) ++ strcpy(platform->machine, "intel"); ++ else ++ strcpy(platform->machine, "powerpc"); + #else + for (temp = platform->machine; *temp != '\0'; temp ++) + if (*temp == '-' || *temp == '_') +@@ -407,7 +412,12 @@ + *temp = tolower(*temp); + + if (strstr(platform->machine, "86") != NULL) +- strcpy(platform->machine, "intel"); ++ { ++ if (strstr(platform->machine, "64") != NULL) ++ strcpy(platform->machine, "x86_64"); ++ else ++ strcpy(platform->machine, "intel"); ++ } + else if (strncmp(platform->machine, "sun", 3) == 0) + strcpy(platform->machine, "sparc"); + #endif /* __sgi */ +diff -urN epm-3.7-old//epm.c epm-3.7/epm.c +--- misc/epm-3.7/epm.c 2003-10-28 14:48:30.000000000 +0000 ++++ misc/build/epm-3.7/epm.c 2010-04-19 22:52:32.000000000 +0000 +@@ -547,6 +547,7 @@ + { + puts(EPM_VERSION); + puts("Copyright 1999-2003 by Easy Software Products."); ++ puts("Patched for LibreOffice"); + puts(""); + puts("EPM is free software and comes with ABSOLUTELY NO WARRANTY; for details"); + puts("see the GNU General Public License in the file COPYING or at"); +diff -urN epm-3.7-old//file.c epm-3.7/file.c +--- misc/epm-3.7/file.c 2003-07-23 21:41:08.000000000 +0000 ++++ misc/build/epm-3.7/file.c 2010-04-19 22:52:32.000000000 +0000 +@@ -108,7 +108,6 @@ + fclose(dstfile); + + chmod(dst, mode); +- chown(dst, owner, group); + + return (0); + } +@@ -138,7 +137,6 @@ + { + mkdir(buffer, 0777); + chmod(buffer, mode | 0700); +- chown(buffer, owner, group); + } + } + +@@ -151,7 +149,6 @@ + { + mkdir(buffer, 0777); + chmod(buffer, mode | 0700); +- chown(buffer, owner, group); + } + + return (0); +diff -urN epm-3.7-old//osx.c epm-3.7/osx.c +--- misc/epm-3.7/osx.c 2003-07-23 21:41:08.000000000 +0000 ++++ misc/build/epm-3.7/osx.c 2010-04-19 22:52:32.000000000 +0000 +@@ -373,7 +373,7 @@ + else + snprintf(filename, sizeof(filename), "%s/%s", current, directory); + +- run_command(NULL, "/Developer/Applications/PackageMaker.app/" ++ run_command(NULL, "/Developer/Applications/Utilities/PackageMaker.app/" + "Contents/MacOS/PackageMaker -build " + "-p %s/%s.pkg -f %s/Package -r %s/Resources -d %s/%s-desc.plist -i %s/%s-info.plist", + filename, prodname, filename, filename, filename, prodname, filename, prodname); +diff -urN epm-3.7-old//pkg.c epm-3.7/pkg.c +--- misc/epm-3.7/pkg.c 2002-12-17 18:57:56.000000000 +0000 ++++ misc/build/epm-3.7/pkg.c 2010-04-19 22:52:32.000000000 +0000 +@@ -429,75 +429,6 @@ + + fclose(fp); + +- /* +- * Build the distribution from the prototype file... +- */ +- +- if (Verbosity) +- puts("Building PKG binary distribution..."); +- +- if (run_command(NULL, "pkgmk -o -f %s/%s.prototype -d %s/%s", +- directory, prodname, current, directory)) +- return (1); +- +- /* +- * Tar and compress the distribution... +- */ +- +- if (Verbosity) +- puts("Creating tar.gz file for distribution..."); +- +- snprintf(filename, sizeof(filename), "%s/%s.tar.gz", directory, name); +- +- if ((tarfile = tar_open(filename, 1)) == NULL) +- return (1); +- +- snprintf(filename, sizeof(filename), "%s/%s", directory, prodname); +- +- if (tar_directory(tarfile, filename, prodname)) +- { +- tar_close(tarfile); +- return (1); +- } +- +- tar_close(tarfile); +- +- /* +- * Make a package stream file... +- */ +- +- if (Verbosity) +- puts("Copying into package stream file..."); +- +- if (run_command(directory, "pkgtrans -s %s/%s %s.pkg %s", +- current, directory, name, prodname)) +- return (1); +- +- /* +- * Remove temporary files... +- */ +- +- if (!KeepFiles) +- { +- if (Verbosity) +- puts("Removing temporary distribution files..."); +- +- snprintf(filename, sizeof(filename), "%s/%s.pkginfo", directory, prodname); +- unlink(filename); +- snprintf(filename, sizeof(filename), "%s/%s.depend", directory, prodname); +- unlink(filename); +- snprintf(filename, sizeof(filename), "%s/%s.prototype", directory, prodname); +- unlink(filename); +- if (preinstall[0]) +- unlink(preinstall); +- if (postinstall[0]) +- unlink(postinstall); +- if (preremove[0]) +- unlink(preremove); +- if (postremove[0]) +- unlink(postremove); +- } +- + return (0); + } + +diff -urN epm-3.7-old//qprintf.c epm-3.7/qprintf.c +--- misc/epm-3.7-old/qprintf.c 2003-01-27 21:48:03.000000000 +0000 ++++ misc/build/epm-3.7/qprintf.c 2010-04-19 22:52:32.000000000 +0000 +@@ -181,12 +181,19 @@ + + for (i = slen; i > 0; i --, s ++, bytes ++) + { ++#if defined(__FreeBSD__) ++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s)) ++ { ++ putc('\\', fp); ++ bytes ++; ++ } ++#else + if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) + { + putc('\\', fp); + bytes ++; + } +- ++#endif + putc(*s, fp); + } + +diff -urN epm-3.7-old//rpm.c epm-3.7/rpm.c +--- misc/epm-3.7/rpm.c 2003-10-01 19:27:15.000000000 +0000 ++++ misc/build/epm-3.7/rpm.c 2010-04-19 22:52:32.000000000 +0000 +@@ -38,7 +38,7 @@ + dist_t *dist, /* I - Distribution information */ + struct utsname *platform) /* I - Platform information */ + { +- int i; /* Looping var */ ++ int i,n; /* Looping vars */ + FILE *fp; /* Spec file */ + char name[1024]; /* Full product name */ + char specname[1024]; /* Spec filename */ +@@ -160,6 +160,8 @@ + fprintf(fp, "Requires: %s", dname); + else if (d->type == DEPEND_PROVIDES) + fprintf(fp, "Provides: %s", dname); ++ else if (d->type == DEPEND_REPLACES) ++ fprintf(fp, "Obsoletes: %s", dname); + else + fprintf(fp, "Conflicts: %s", dname); + +@@ -186,15 +188,33 @@ + for (i = 0; i < dist->num_descriptions; i ++) + fprintf(fp, "%s\n", dist->descriptions[i]); + +- fputs("%pre\n", fp); ++ /* ++ * %pre ++ */ ++ n = 0; + for (i = dist->num_commands, c = dist->commands; i > 0; i --, c ++) ++ { + if (c->type == COMMAND_PRE_INSTALL) ++ { ++ if (1 == ++n) /* Only write %pre if there is at least one command */ ++ fputs("%pre\n", fp); + fprintf(fp, "%s\n", c->command); ++ } ++ } + +- fputs("%post\n", fp); ++ /* ++ * %post ++ */ ++ n = 0; + for (i = dist->num_commands, c = dist->commands; i > 0; i --, c ++) ++ { + if (c->type == COMMAND_POST_INSTALL) ++ { ++ if (1 == ++n) /* Only write %post if there is at least one command */ ++ fputs("%post\n", fp); + fprintf(fp, "%s\n", c->command); ++ } ++ } + + for (i = dist->num_files, file = dist->files; i > 0; i --, file ++) + if (tolower(file->type) == 'i') +@@ -202,6 +222,8 @@ + + if (i) + { ++ if (1 == ++n) /* If not previously done so, write %post here */ ++ fputs("%post\n", fp); + fputs("if test \"x$1\" = x1; then\n", fp); + fputs(" echo Setting up init scripts...\n", fp); + +@@ -259,13 +281,17 @@ + fputs("fi\n", fp); + } + +- fputs("%preun\n", fp); ++ /* ++ * %preun ++ */ ++ n = 0; + for (i = dist->num_files, file = dist->files; i > 0; i --, file ++) + if (tolower(file->type) == 'i') + break; + + if (i) + { ++ fputs("%preun\n", fp); ++n; /* Need to write %preun here */ + fputs("if test \"x$1\" = x0; then\n", fp); + fputs(" echo Cleaning up init scripts...\n", fp); + +@@ -315,13 +341,29 @@ + } + + for (i = dist->num_commands, c = dist->commands; i > 0; i --, c ++) ++ { + if (c->type == COMMAND_PRE_REMOVE) ++ { ++ if (1 == ++n) /* Only write %preun if not previously done so */ ++ fputs("%preun\n", fp); ++ + fprintf(fp, "%s\n", c->command); ++ } ++ } + +- fputs("%postun\n", fp); ++ /* ++ * %post ++ */ ++ n = 0; + for (i = dist->num_commands, c = dist->commands; i > 0; i --, c ++) ++ { + if (c->type == COMMAND_POST_REMOVE) ++ { ++ if (1 == ++n) /* Only write %post if there is at least one command */ ++ fputs("%postun\n", fp); + fprintf(fp, "%s\n", c->command); ++ } ++ } + + fputs("%files\n", fp); + for (i = dist->num_files, file = dist->files; i > 0; i --, file ++) +@@ -415,53 +457,6 @@ + } + } + +- /* +- * Build the distribution from the spec file... +- */ +- +- if (Verbosity) +- puts("Building RPM binary distribution..."); +- +- if (strcmp(platform->machine, "intel") == 0) +- { +- if (run_command(NULL, EPM_RPMBUILD " %s -bb " EPM_RPMARCH "i386 %s", +- Verbosity == 0 ? "--quiet" : "", specname)) +- return (1); +- } +- else if (run_command(NULL, EPM_RPMBUILD " %s -bb " EPM_RPMARCH "%s %s", +- Verbosity == 0 ? "--quiet" : "", platform->machine, +- specname)) +- return (1); +- +- /* +- * Move the RPM to the local directory and rename the RPM using the +- * product name specified by the user... +- */ +- +- if (strcmp(platform->machine, "intel") == 0) +- run_command(NULL, "/bin/mv %s/RPMS/i386/%s-%s-%d.i386.rpm %s/%s.rpm", +- rpmdir, prodname, dist->version, dist->relnumber, +- directory, name); +- else +- run_command(NULL, "/bin/mv %s/RPMS/%s/%s-%s-%d.%s.rpm %s/%s.rpm", +- rpmdir, platform->machine, prodname, dist->version, +- dist->relnumber, platform->machine, directory, name); +- +- /* +- * Remove temporary files... +- */ +- +- if (!KeepFiles) +- { +- if (Verbosity) +- puts("Removing temporary distribution files..."); +- +- run_command(NULL, "/bin/rm -rf %s/RPMS", directory); +- run_command(NULL, "/bin/rm -rf %s/buildroot", directory); +- +- unlink(specname); +- } +- + return (0); + } + diff --git a/external/epoxy/Library_epoxy.mk b/external/epoxy/Library_epoxy.mk new file mode 100644 index 000000000..81c35d695 --- /dev/null +++ b/external/epoxy/Library_epoxy.mk @@ -0,0 +1,65 @@ +# -*- 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_Library_Library,epoxy)) + +$(eval $(call gb_Library_use_unpacked,epoxy,epoxy)) + +$(eval $(call gb_Library_set_warnings_disabled,epoxy)) + +$(eval $(call gb_Library_set_include,epoxy,\ + -I$(call gb_UnpackedTarball_get_dir,epoxy)/include \ + -I$(call gb_UnpackedTarball_get_dir,epoxy)/src \ + $$(INCLUDE) \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_libs,epoxy,\ + -ldl \ +)) +endif + +$(eval $(call gb_Library_add_generated_cobjects,epoxy,\ + UnpackedTarball/epoxy/src/dispatch_common \ + UnpackedTarball/epoxy/src/gl_generated_dispatch \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_generated_cobjects,epoxy,\ + UnpackedTarball/epoxy/src/dispatch_wgl \ + UnpackedTarball/epoxy/src/wgl_generated_dispatch \ +)) +else ifneq ($(filter iOS MACOSX,$(OS)),) +# nothing +else ifeq ($(OS),ANDROID) +$(eval $(call gb_Library_add_generated_cobjects,epoxy,\ + UnpackedTarball/epoxy/src/dispatch_egl \ + UnpackedTarball/epoxy/src/egl_generated_dispatch \ +)) +else +$(eval $(call gb_Library_add_generated_cobjects,epoxy,\ + UnpackedTarball/epoxy/src/dispatch_glx \ + UnpackedTarball/epoxy/src/glx_generated_dispatch \ +)) +ifeq ($(ENABLE_GTK3),TRUE) +$(eval $(call gb_Library_add_cflags,epoxy,\ + -DPLATFORM_HAS_EGL=1 \ +)) +$(eval $(call gb_Library_add_generated_cobjects,epoxy,\ + UnpackedTarball/epoxy/src/dispatch_egl \ + UnpackedTarball/epoxy/src/egl_generated_dispatch \ +)) +else +$(eval $(call gb_Library_add_cflags,epoxy,\ + -DPLATFORM_HAS_EGL=0 \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/epoxy/Makefile b/external/epoxy/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/epoxy/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/epoxy/Module_epoxy.mk b/external/epoxy/Module_epoxy.mk new file mode 100644 index 000000000..ea65176b8 --- /dev/null +++ b/external/epoxy/Module_epoxy.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,epoxy)) + +$(eval $(call gb_Module_add_targets,epoxy,\ + Library_epoxy \ + UnpackedTarball_epoxy \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/epoxy/README b/external/epoxy/README new file mode 100644 index 000000000..8bd467af5 --- /dev/null +++ b/external/epoxy/README @@ -0,0 +1,5 @@ +Epoxy is an OpenGL Extension Wrangler + +Epoxy is a library for handling OpenGL function pointer management for you + +https://github.com/anholt/libepoxy diff --git a/external/epoxy/UnpackedTarball_epoxy.mk b/external/epoxy/UnpackedTarball_epoxy.mk new file mode 100644 index 000000000..8dce1ba9d --- /dev/null +++ b/external/epoxy/UnpackedTarball_epoxy.mk @@ -0,0 +1,35 @@ +# -*- 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,epoxy)) + +$(eval $(call gb_UnpackedTarball_set_tarball,epoxy,$(EPOXY_TARBALL))) + +$(call gb_UnpackedTarball_get_target,epoxy) :| $(call gb_ExternalExecutable_get_dependencies,python) + +epoxy_PYTHON := $(call gb_ExternalExecutable_get_command,python) + +# previous versions of epoxy bundled the output, but now it has to be generated +$(eval $(call gb_UnpackedTarball_set_pre_action,epoxy,\ + $(epoxy_PYTHON) ./src/gen_dispatch.py --srcdir src --includedir include/epoxy registry/gl.xml && \ + $(epoxy_PYTHON) ./src/gen_dispatch.py --srcdir src --includedir include/epoxy registry/glx.xml && \ + $(epoxy_PYTHON) ./src/gen_dispatch.py --srcdir src --includedir include/epoxy registry/egl.xml && \ + $(epoxy_PYTHON) ./src/gen_dispatch.py --srcdir src --includedir include/epoxy registry/wgl.xml \ +)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,epoxy,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,epoxy, \ + external/epoxy/epoxy.visibility.patch \ + external/epoxy/epoxy.windows.api.patch \ + external/epoxy/epoxy.noegl.by.default.patch \ + external/epoxy/clang-cl.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/epoxy/clang-cl.patch b/external/epoxy/clang-cl.patch new file mode 100644 index 000000000..80b491271 --- /dev/null +++ b/external/epoxy/clang-cl.patch @@ -0,0 +1,14 @@ +--- src/dispatch_common.c ++++ src/dispatch_common.c +@@ -190,7 +190,11 @@ + #endif + }; + ++#if defined _MSC_VER && defined __clang__ ++static bool library_initialized = true; ++#else + static bool library_initialized; ++#endif + + static bool epoxy_current_context_is_glx(void); + diff --git a/external/epoxy/epoxy.noegl.by.default.patch b/external/epoxy/epoxy.noegl.by.default.patch new file mode 100644 index 000000000..bf8945336 --- /dev/null +++ b/external/epoxy/epoxy.noegl.by.default.patch @@ -0,0 +1,28 @@ +--- src/dispatch_common.h ++++ src/dispatch_common.h +@@ -24,20 +24,19 @@ + #include "config.h" + + #ifdef _WIN32 +-#define PLATFORM_HAS_EGL ENABLE_EGL +-#define PLATFORM_HAS_GLX ENABLE_GLX ++#define PLATFORM_HAS_EGL 0 ++#define PLATFORM_HAS_GLX 0 + #define PLATFORM_HAS_WGL 1 + #elif defined(__APPLE__) + #define PLATFORM_HAS_EGL 0 +-#define PLATFORM_HAS_GLX ENABLE_GLX ++#define PLATFORM_HAS_GLX 0 + #define PLATFORM_HAS_WGL 0 + #elif defined(ANDROID) +-#define PLATFORM_HAS_EGL ENABLE_EGL ++#define PLATFORM_HAS_EGL 1 + #define PLATFORM_HAS_GLX 0 + #define PLATFORM_HAS_WGL 0 + #else +-#define PLATFORM_HAS_EGL ENABLE_EGL +-#define PLATFORM_HAS_GLX ENABLE_GLX ++#define PLATFORM_HAS_GLX 1 + #define PLATFORM_HAS_WGL 0 + #endif + diff --git a/external/epoxy/epoxy.visibility.patch b/external/epoxy/epoxy.visibility.patch new file mode 100644 index 000000000..12297b5e2 --- /dev/null +++ b/external/epoxy/epoxy.visibility.patch @@ -0,0 +1,5 @@ +--- src/config.h 2018-08-28 13:19:40.699141662 +0100 ++++ src/config.h 2018-08-28 13:21:51.942139881 +0100 +@@ -0,0 +1,2 @@ ++#include <sal/types.h> ++#define EPOXY_PUBLIC SAL_DLLPUBLIC_EXPORT extern diff --git a/external/epoxy/epoxy.windows.api.patch b/external/epoxy/epoxy.windows.api.patch new file mode 100644 index 000000000..985f2d880 --- /dev/null +++ b/external/epoxy/epoxy.windows.api.patch @@ -0,0 +1,12 @@ +--- include/epoxy/gl.h ++++ include/epoxy/gl.h +@@ -59,7 +59,8 @@ + + #else + #ifndef APIENTRY +-#define APIENTRY __stdcall ++#define WINAPI __stdcall ++#define APIENTRY WINAPI + #endif + + #ifndef GLAPIENTRY diff --git a/external/expat/ExternalProject_expat.mk b/external/expat/ExternalProject_expat.mk new file mode 100644 index 000000000..4f4f0301c --- /dev/null +++ b/external/expat/ExternalProject_expat.mk @@ -0,0 +1,25 @@ +# -*- 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,expat)) + +$(eval $(call gb_ExternalProject_register_targets,expat,\ + configure \ +)) + +$(call gb_ExternalProject_get_state_target,expat,configure) : + $(call gb_Trace_StartRange,expat,EXTERNAL) + $(call gb_ExternalProject_run,configure,\ + ./configure --without-docbook \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ + ,,expat_configure.log) + $(call gb_Trace_EndRange,expat,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/expat/Makefile b/external/expat/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/expat/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/expat/Module_expat.mk b/external/expat/Module_expat.mk new file mode 100644 index 000000000..baac0b595 --- /dev/null +++ b/external/expat/Module_expat.mk @@ -0,0 +1,30 @@ +# -*- 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,expat)) + +$(eval $(call gb_Module_add_targets,expat,\ + UnpackedTarball_expat \ + StaticLibrary_expat \ +)) + +ifneq ($(OS),WNT) +$(eval $(call gb_Module_add_targets,expat,\ + ExternalProject_expat \ +)) +endif + +# ---------------- X64 stuff special --------------------- +ifeq ($(BUILD_X64),TRUE) +$(eval $(call gb_Module_add_targets,expat,\ + StaticLibrary_expat_x64 \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/expat/README b/external/expat/README new file mode 100644 index 000000000..e7c93c246 --- /dev/null +++ b/external/expat/README @@ -0,0 +1,4 @@ +Simple SAX parser library with added UTF-16 support. + +From: +[https://github.com/libexpat/libexpat] diff --git a/external/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk new file mode 100644 index 000000000..025ab617a --- /dev/null +++ b/external/expat/StaticLibrary_expat.mk @@ -0,0 +1,51 @@ +# -*- 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_StaticLibrary_StaticLibrary,expat)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,expat)) + +$(eval $(call gb_StaticLibrary_use_unpacked,expat,expat)) + +# no configure step on windows, no dependency +ifneq ($(OS),WNT) +$(eval $(call gb_StaticLibrary_use_external_project,expat,expat,full)) +endif + +$(eval $(call gb_StaticLibrary_set_include,expat,\ + -I$(call gb_UnpackedTarball_get_dir,expat) \ + $$(INCLUDE) \ +)) + +ifeq ($(OS),MACOSX) +ifneq ($(strip $(SYSBASE)),) +$(eval $(call gb_StaticLibrary_add_defs,expat,\ + -DHAVE_MEMMOVE \ + -DHAVE_BCOPY \ +)) +endif +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_StaticLibrary_add_defs,expat,\ + -DCOMPILED_FROM_DSP \ +)) +else +$(eval $(call gb_StaticLibrary_add_defs,expat,\ + -DHAVE_EXPAT_CONFIG_H \ +)) +endif + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\ + UnpackedTarball/expat/lib/xmlparse \ + UnpackedTarball/expat/lib/xmlrole \ + UnpackedTarball/expat/lib/xmltok \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/expat/StaticLibrary_expat_x64.mk b/external/expat/StaticLibrary_expat_x64.mk new file mode 100644 index 000000000..68bb7f86a --- /dev/null +++ b/external/expat/StaticLibrary_expat_x64.mk @@ -0,0 +1,33 @@ +# -*- 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_StaticLibrary_StaticLibrary,expat_x64)) + +$(eval $(call gb_StaticLibrary_set_x64,expat_x64,YES)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,expat_x64)) + +$(eval $(call gb_StaticLibrary_use_unpacked,expat_x64,expat)) + +$(eval $(call gb_StaticLibrary_set_include,expat_x64,\ + -I$(call gb_UnpackedTarball_get_dir,expat) \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_defs,expat_x64,\ + -DCOMPILED_FROM_DSP \ +)) + +$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_x64,\ + UnpackedTarball/expat/lib/xmlparse_x64 \ + UnpackedTarball/expat/lib/xmltok_x64 \ + UnpackedTarball/expat/lib/xmlrole_x64 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk new file mode 100644 index 000000000..96f4e3ec8 --- /dev/null +++ b/external/expat/UnpackedTarball_expat.mk @@ -0,0 +1,35 @@ +# -*- 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,expat)) + +$(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,expat,conftools)) + +$(eval $(call gb_UnpackedTarball_add_patches,expat,\ + external/expat/expat-winapi.patch \ + external/expat/ubsan.patch.0 \ +)) + +# This is a bit hackish. + +# When building for Windows (as 32-bit) we need to build it twice: as +# 32- and 64-bit code, to be able to produce a 64-bit Explorer +# ("shell") extension that is used when the 32-bit LibreOffice is +# installed on a 64-bit OS. + +$(eval $(call gb_UnpackedTarball_set_post_action,expat,\ + $(if $(filter $(BUILD_X64),TRUE), \ + cp lib/xmlparse.c lib/xmlparse_x64.c && \ + cp lib/xmltok.c lib/xmltok_x64.c && \ + cp lib/xmlrole.c lib/xmlrole_x64.c) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/expat/expat-winapi.patch b/external/expat/expat-winapi.patch new file mode 100644 index 000000000..b33c12b83 --- /dev/null +++ b/external/expat/expat-winapi.patch @@ -0,0 +1,13 @@ +--- misc/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:17.375000000 +0000 ++++ misc/build/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:34.703125000 +0000 +@@ -81,10 +81,6 @@ + # ifndef XML_BUILDING_EXPAT + /* using Expat from an application */ + +-# if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) && ! defined(__CYGWIN__) +-# define XMLIMPORT __declspec(dllimport) +-# endif +- + # endif + #endif /* not defined XML_STATIC */ + diff --git a/external/expat/ubsan.patch.0 b/external/expat/ubsan.patch.0 new file mode 100644 index 000000000..8317f922d --- /dev/null +++ b/external/expat/ubsan.patch.0 @@ -0,0 +1,11 @@ +--- lib/xmlparse.c ++++ lib/xmlparse.c +@@ -6485,7 +6485,7 @@ + static void FASTCALL + hashTableIterInit(HASH_TABLE_ITER *iter, const HASH_TABLE *table) { + iter->p = table->v; +- iter->end = iter->p + table->size; ++ iter->end = table->size == 0 ? iter->p : iter->p + table->size; + } + + static NAMED *FASTCALL diff --git a/external/firebird/0001-Avoid-hangup-in-SS-when-error-happens-at-system-atta.patch.1 b/external/firebird/0001-Avoid-hangup-in-SS-when-error-happens-at-system-atta.patch.1 new file mode 100644 index 000000000..e569fccdc --- /dev/null +++ b/external/firebird/0001-Avoid-hangup-in-SS-when-error-happens-at-system-atta.patch.1 @@ -0,0 +1,51 @@ +From 36a7a2634669075be3294a1d075524a0b6f80962 Mon Sep 17 00:00:00 2001 +From: hvlad <hvlad@users.sourceforge.net> +Date: Wed, 17 Aug 2016 15:45:30 +0300 +Subject: [PATCH] Avoid hangup in SS when error happens at system attachment + initialization time + +--- + src/jrd/cch.cpp | 7 ++++++- + src/jrd/vio.cpp | 5 +++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/jrd/cch.cpp b/src/jrd/cch.cpp +index 35ea096..643cf4d 100644 +--- a/src/jrd/cch.cpp ++++ b/src/jrd/cch.cpp +@@ -2963,10 +2963,15 @@ static THREAD_ENTRY_DECLARE cache_writer(THREAD_ENTRY_PARAM arg) + iscDbLogStatus(dbb->dbb_filename.c_str(), &status_vector); + } + +- bcb->bcb_flags &= ~(BCB_cache_writer | BCB_writer_start); ++ bcb->bcb_flags &= ~BCB_cache_writer; + + try + { ++ if (bcb->bcb_flags & BCB_writer_start) ++ { ++ bcb->bcb_flags &= ~BCB_writer_start; ++ bcb->bcb_writer_init.release(); ++ } + bcb->bcb_writer_fini.release(); + } + catch (const Firebird::Exception& ex) +diff --git a/src/jrd/vio.cpp b/src/jrd/vio.cpp +index a8cf0fc..3d35a27 100644 +--- a/src/jrd/vio.cpp ++++ b/src/jrd/vio.cpp +@@ -4988,6 +4988,11 @@ static THREAD_ENTRY_DECLARE garbage_collector(THREAD_ENTRY_PARAM arg) + try + { + // Notify the finalization caller that we're finishing. ++ if (dbb->dbb_flags & DBB_gc_starting) ++ { ++ dbb->dbb_flags &= ~DBB_gc_starting; ++ dbb->dbb_gc_init.release(); ++ } + dbb->dbb_gc_fini.release(); + } + catch (const Firebird::Exception& ex) +-- +2.9.3 + diff --git a/external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1 b/external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1 new file mode 100644 index 000000000..0e21f9e27 --- /dev/null +++ b/external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1 @@ -0,0 +1,37 @@ +From 60cb8e07b17ad8533d7d13f52435aa11e48f4659 Mon Sep 17 00:00:00 2001 +From: Dimitry Sibiryakov <sd@ibphoenix.com> +Date: Tue, 12 Nov 2019 13:42:49 +0100 +Subject: [PATCH] Fix warning on Win64 build (#231) + +--- + src/common/ThreadStart.cpp | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/common/ThreadStart.cpp b/src/common/ThreadStart.cpp +index 184c93a32b..758056432f 100644 +--- a/src/common/ThreadStart.cpp ++++ b/src/common/ThreadStart.cpp +@@ -309,13 +309,16 @@ Thread Thread::start(ThreadEntryPoint* routine, void* arg, int priority_arg, Han + * Advanced Windows by Richter pg. # 109. */ + + unsigned thread_id; +- unsigned long real_handle = +- _beginthreadex(NULL, 0, THREAD_ENTRYPOINT, THREAD_ARG, CREATE_SUSPENDED, &thread_id); +- if (!real_handle) ++ HANDLE handle = ++ reinterpret_cast<HANDLE>(_beginthreadex(NULL, 0, THREAD_ENTRYPOINT, THREAD_ARG, CREATE_SUSPENDED, &thread_id)); ++ if (!handle) + { ++ // Though MSDN says that _beginthreadex() returns error in errno, ++ // GetLastError() still works because RTL call no other system ++ // functions after CreateThread() in the case of error. ++ // Watch out if it is ever changed. + Firebird::system_call_failed::raise("_beginthreadex", GetLastError()); + } +- HANDLE handle = reinterpret_cast<HANDLE>(real_handle); + + SetThreadPriority(handle, priority); + +-- +2.20.1 + diff --git a/external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 b/external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 new file mode 100644 index 000000000..42c677f7e --- /dev/null +++ b/external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 @@ -0,0 +1,49 @@ +From 15390d75ee6ca429dbbe15ea04214df8a30fbd48 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Mon, 21 Oct 2019 17:54:18 +0200 +Subject: [PATCH] Make comparison operator member functions const + +...which avoids overload resolution ambiguities in C++20, when a synthesized +candidate of operator == for a reversed-argument rewrite conflicts with the +actual operator ==, due to the asymmetric const-ness of the implicit object +parameter and the RHS parameter. (As observed with recent Clang 10 trunk with +-std=c++2a when building firebird as part of LibreOffice: + +> workdir/UnpackedTarball/firebird/src/jrd/inf.cpp:1139:62: error: use of overloaded operator '!=' is ambiguous (with operand types 'RuntimeStatistics::Iterator' and 'Jrd::RuntimeStatistics::Iterator') +> for (RuntimeStatistics::Iterator iter = stats.begin(); iter != stats.end(); ++iter) +> ~~~~ ^ ~~~~~~~~~~~ +> workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/RuntimeStatistics.h:283:8: note: candidate function +> bool operator!=(const Iterator& other) +> ^ +> workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/RuntimeStatistics.h:278:8: note: candidate function +> bool operator==(const Iterator& other) +> ^ +> workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/RuntimeStatistics.h:278:8: note: candidate function (with reversed parameter order) + +) +--- + src/jrd/RuntimeStatistics.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/jrd/RuntimeStatistics.h b/src/jrd/RuntimeStatistics.h +index 74a03de2ad..fab286ad1a 100644 +--- a/src/jrd/RuntimeStatistics.h ++++ b/src/jrd/RuntimeStatistics.h +@@ -290,12 +290,12 @@ public: + {} + + public: +- bool operator==(const Iterator& other) ++ bool operator==(const Iterator& other) const + { + return (m_counts == other.m_counts); + } + +- bool operator!=(const Iterator& other) ++ bool operator!=(const Iterator& other) const + { + return (m_counts != other.m_counts); + } +-- +2.21.0 + diff --git a/external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1 b/external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1 new file mode 100644 index 000000000..c55df4d0a --- /dev/null +++ b/external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1 @@ -0,0 +1,1013 @@ +From 40f782ae3e918c4f3842571ff8064be1c4f54961 Mon Sep 17 00:00:00 2001 +From: AlexPeshkoff <peshkoff@mail.ru> +Date: Fri, 13 Jan 2017 14:29:54 +0300 +Subject: [PATCH] Backported fix for CORE-5452: Segfault when engine's dynamic + library is unloaded right after closing worker threads (GC and/or cache + writer) + +--- + src/alice/alice_meta.epp | 1 - + src/burp/burp.h | 2 - + src/common/ThreadStart.h | 86 ++++++++++++++++++++++++++++ + src/common/classes/Synchronize.h | 5 +- + src/common/classes/misc/class_perf.cpp | 1 - + src/common/xdr.cpp | 2 - + src/gpre/boot/gpre_meta_boot.cpp | 1 - + src/gpre/std/gpre_meta.epp | 1 - + src/include/fb_exception.h | 1 - + src/include/firebird.h | 1 - + src/isql/OptionsBase.cpp | 1 - + src/isql/extract.epp | 1 - + src/isql/isql.epp | 5 -- + src/jrd/Attachment.h | 1 + + src/jrd/Database.h | 6 +- + src/jrd/Mapping.cpp | 26 +++++---- + src/jrd/cch.cpp | 31 +++++----- + src/jrd/cch.h | 14 ++++- + src/jrd/event.cpp | 13 +++-- + src/jrd/event_proto.h | 7 +-- + src/jrd/intl.cpp | 1 - + src/jrd/trace/TraceConfigStorage.h | 1 + + src/jrd/vio.cpp | 23 ++++---- + src/lock/lock.cpp | 29 ++++++---- + src/lock/lock_proto.h | 8 +-- + src/qli/command.cpp | 1 - + src/qli/dtr.h | 1 - + src/qli/lex.cpp | 4 -- + src/qli/meta.epp | 1 - + src/utilities/gsec/gsecswi.h | 1 - + src/utilities/gstat/dba.epp | 1 + + src/utilities/nbackup/nbkswi.h | 1 - + src/utilities/ntrace/os/win32/FileObject.cpp | 1 - + src/yvalve/gds.cpp | 1 + + src/yvalve/preparse.cpp | 1 - + 35 files changed, 182 insertions(+), 99 deletions(-) + +diff --git a/src/alice/alice_meta.epp b/src/alice/alice_meta.epp +index d0f59bc..65dc37e 100644 +--- a/src/alice/alice_meta.epp ++++ b/src/alice/alice_meta.epp +@@ -30,7 +30,6 @@ + #include "firebird.h" + #include <stdio.h> + #include "../jrd/ibase.h" +-//#include "../jrd/license.h" + #include "../alice/alice.h" + #include "../alice/alice_meta.h" + #include "../yvalve/gds_proto.h" +diff --git a/src/burp/burp.h b/src/burp/burp.h +index 293a91f..fe26335 100644 +--- a/src/burp/burp.h ++++ b/src/burp/burp.h +@@ -769,8 +769,6 @@ struct burp_meta_obj + // I need to review if we tolerate different lengths for different OS's here. + const unsigned int MAX_FILE_NAME_SIZE = 256; + +-//#include "../jrd/svc.h" +- + #include "../burp/std_desc.h" + + #ifdef WIN_NT +diff --git a/src/common/ThreadStart.h b/src/common/ThreadStart.h +index 85e6a38..823c5c1 100644 +--- a/src/common/ThreadStart.h ++++ b/src/common/ThreadStart.h +@@ -31,6 +31,7 @@ + #define JRD_THREADSTART_H + + #include "../common/ThreadData.h" ++#include "../common/classes/semaphore.h" + + #ifdef WIN_NT + #include <windows.h> +@@ -89,4 +90,89 @@ inline ThreadId getThreadId() + return Thread::getId(); + } + ++ ++#ifndef USE_POSIX_THREADS ++#define USE_FINI_SEM ++#endif ++ ++template <typename TA> ++class ThreadFinishSync ++{ ++public: ++ typedef void ThreadRoutine(TA); ++ ++ ThreadFinishSync(Firebird::MemoryPool& pool, ThreadRoutine* routine, int priority_arg) ++ : ++#ifdef USE_FINI_SEM ++ fini(pool), ++#else ++ threadHandle(0), ++#endif ++ threadRoutine(routine), ++ threadPriority(priority_arg) ++ { } ++ ++ void run(TA arg) ++ { ++ threadArg = arg; ++ ++ Thread::start(internalRun, this, threadPriority ++#ifndef USE_FINI_SEM ++ , &threadHandle ++#endif ++ ); ++ } ++ ++ void waitForCompletion() ++ { ++#ifdef USE_FINI_SEM ++ fini.enter(); ++#else ++ Thread::waitForCompletion(threadHandle); ++ threadHandle = 0; ++#endif ++ } ++ ++private: ++#ifdef USE_FINI_SEM ++ Firebird::Semaphore fini; ++#else ++ Thread::Handle threadHandle; ++#endif ++ ++ TA threadArg; ++ ThreadRoutine* threadRoutine; ++ int threadPriority; ++ bool starting; ++ ++ static THREAD_ENTRY_DECLARE internalRun(THREAD_ENTRY_PARAM arg) ++ { ++ ((ThreadFinishSync*)arg)->internalRun(); ++ return 0; ++ } ++ ++ void internalRun() ++ { ++ try ++ { ++ threadRoutine(threadArg); ++ } ++ catch (const Firebird::Exception& ex) ++ { ++ threadArg->exceptionHandler(ex, threadRoutine); ++ } ++ ++#ifdef USE_FINI_SEM ++ try ++ { ++ fini.release(); ++ } ++ catch (const Firebird::Exception& ex) ++ { ++ threadArg->exceptionHandler(ex, threadRoutine); ++ } ++#endif ++ } ++}; ++ + #endif // JRD_THREADSTART_H +diff --git a/src/common/classes/Synchronize.h b/src/common/classes/Synchronize.h +index 198de44..3788541 100644 +--- a/src/common/classes/Synchronize.h ++++ b/src/common/classes/Synchronize.h +@@ -33,10 +33,7 @@ + #define CLASSES_SYNCHRONIZE_H + + #include "../common/classes/SyncObject.h" +- +-#ifndef WIN_NT +-#include "fb_pthread.h" +-#endif ++#include "../common/ThreadStart.h" + + + namespace Firebird { +diff --git a/src/common/classes/misc/class_perf.cpp b/src/common/classes/misc/class_perf.cpp +index 97b7bb3..142bfde 100644 +--- a/src/common/classes/misc/class_perf.cpp ++++ b/src/common/classes/misc/class_perf.cpp +@@ -28,7 +28,6 @@ + + #include "tree.h" + #include "alloc.h" +-//#include "../memory/memory_pool.h" + #include <stdio.h> + #include <time.h> + #include <set> +diff --git a/src/common/xdr.cpp b/src/common/xdr.cpp +index b9f9f4d..1dfff76 100644 +--- a/src/common/xdr.cpp ++++ b/src/common/xdr.cpp +@@ -26,9 +26,7 @@ + + #include "firebird.h" + #include <string.h> +-//#include "../remote/remote.h" + #include "../common/xdr.h" +-//#include "../remote/proto_proto.h" + #include "../common/xdr_proto.h" + #include "../yvalve/gds_proto.h" + #include "../common/gdsassert.h" +diff --git a/src/gpre/boot/gpre_meta_boot.cpp b/src/gpre/boot/gpre_meta_boot.cpp +index 0fde018..1f302c6 100644 +--- a/src/gpre/boot/gpre_meta_boot.cpp ++++ b/src/gpre/boot/gpre_meta_boot.cpp +@@ -32,7 +32,6 @@ + #include <string.h> + #include "../jrd/ibase.h" + #include "../gpre/gpre.h" +-//#include "../jrd/license.h" + #include "../jrd/intl.h" + #include "../gpre/gpre_proto.h" + #include "../gpre/hsh_proto.h" +diff --git a/src/gpre/std/gpre_meta.epp b/src/gpre/std/gpre_meta.epp +index 34ff932..0780dd4 100644 +--- a/src/gpre/std/gpre_meta.epp ++++ b/src/gpre/std/gpre_meta.epp +@@ -32,7 +32,6 @@ + #include <string.h> + #include "../jrd/ibase.h" + #include "../gpre/gpre.h" +-//#include "../jrd/license.h" + #include "../jrd/intl.h" + #include "../gpre/gpre_proto.h" + #include "../gpre/hsh_proto.h" +diff --git a/src/include/fb_exception.h b/src/include/fb_exception.h +index 030cf94..c4c1df4 100644 +--- a/src/include/fb_exception.h ++++ b/src/include/fb_exception.h +@@ -43,7 +43,6 @@ + + #include "fb_types.h" + #include "firebird/Interface.h" +-#include "../common/ThreadStart.h" + + namespace Firebird + { +diff --git a/src/include/firebird.h b/src/include/firebird.h +index 3d74354..87f0a11 100644 +--- a/src/include/firebird.h ++++ b/src/include/firebird.h +@@ -68,7 +68,6 @@ + + #ifdef __cplusplus + #include "../common/common.h" +-//#include "fb_exception.h" + #endif + + #ifndef NULL +diff --git a/src/isql/OptionsBase.cpp b/src/isql/OptionsBase.cpp +index 5a78540..0974fa3 100644 +--- a/src/isql/OptionsBase.cpp ++++ b/src/isql/OptionsBase.cpp +@@ -24,7 +24,6 @@ + + #include "firebird.h" + #include "OptionsBase.h" +-//#include "../common/utils_proto.h" // strnicmp + #include "../common/gdsassert.h" + + +diff --git a/src/isql/extract.epp b/src/isql/extract.epp +index ec2ddb1..99e821c 100644 +--- a/src/isql/extract.epp ++++ b/src/isql/extract.epp +@@ -59,7 +59,6 @@ + #include "../jrd/ods.h" + #include "../common/utils_proto.h" + #include "../jrd/constants.h" +-//#include "../common/classes/ImplementHelper.h" + + using MsgFormat::SafeArg; + +diff --git a/src/isql/isql.epp b/src/isql/isql.epp +index ccadce2..98b37bb 100644 +--- a/src/isql/isql.epp ++++ b/src/isql/isql.epp +@@ -46,7 +46,6 @@ + #include "firebird.h" + #include <stdio.h> + #include "../yvalve/keywords.h" +-//#include "../yvalve/gds_proto.h" + #include "../jrd/intl.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -79,10 +78,6 @@ + #include <locale.h> + #endif + +-//#ifdef HAVE_IO_H +-//#include <io.h> // mktemp +-//#endif +- + #ifdef HAVE_EDITLINE_H + // This is a local file included in our distribution - but not always + // compiled into the system +diff --git a/src/jrd/Attachment.h b/src/jrd/Attachment.h +index 2807db3..e71610e 100644 +--- a/src/jrd/Attachment.h ++++ b/src/jrd/Attachment.h +@@ -39,6 +39,7 @@ + #include "../common/classes/array.h" + #include "../common/classes/stack.h" + #include "../common/classes/timestamp.h" ++#include "../common/ThreadStart.h" + + #include "../jrd/EngineInterface.h" + +diff --git a/src/jrd/Database.h b/src/jrd/Database.h +index 0eab40d..f0f44d3 100644 +--- a/src/jrd/Database.h ++++ b/src/jrd/Database.h +@@ -440,7 +440,7 @@ public: + GarbageCollector* dbb_garbage_collector; // GarbageCollector class + Firebird::Semaphore dbb_gc_sem; // Event to wake up garbage collector + Firebird::Semaphore dbb_gc_init; // Event for initialization garbage collector +- Firebird::Semaphore dbb_gc_fini; // Event for finalization garbage collector ++ ThreadFinishSync<Database*> dbb_gc_fini; // Sync for finalization garbage collector + + Firebird::MemoryStats dbb_memory_stats; + RuntimeStatistics dbb_stats; +@@ -511,6 +511,7 @@ private: + dbb_owner(*p), + dbb_pools(*p, 4), + dbb_sort_buffers(*p), ++ dbb_gc_fini(*p, garbage_collector, THREAD_medium), + dbb_stats(*p), + dbb_lock_owner_id(getLockOwnerId()), + dbb_tip_cache(NULL), +@@ -560,6 +561,9 @@ public: + // reset sweep flags and release sweep lock + void clearSweepFlags(thread_db* tdbb); + ++ static void garbage_collector(Database* dbb); ++ void exceptionHandler(const Firebird::Exception& ex, ThreadFinishSync<Database*>::ThreadRoutine* routine); ++ + private: + //static int blockingAstSharedCounter(void*); + static int blocking_ast_sweep(void* ast_object); +diff --git a/src/jrd/Mapping.cpp b/src/jrd/Mapping.cpp +index c1bcf0e..8df7e2f 100644 +--- a/src/jrd/Mapping.cpp ++++ b/src/jrd/Mapping.cpp +@@ -581,7 +581,8 @@ class MappingIpc FB_FINAL : public Firebird::IpcObject + + public: + explicit MappingIpc(MemoryPool&) +- : processId(getpid()) ++ : processId(getpid()), ++ cleanupSync(*getDefaultMemoryPool(), clearDelivery, THREAD_high) + { } + + ~MappingIpc() +@@ -602,7 +603,7 @@ public: + sMem->process[process].flags &= ~MappingHeader::FLAG_ACTIVE; + (void) // Ignore errors in cleanup + sharedMemory->eventPost(&sMem->process[process].notifyEvent); +- cleanupSemaphore.tryEnter(5); ++ cleanupSync.waitForCompletion(); + + // Ignore errors in cleanup + sharedMemory->eventFini(&sMem->process[process].notifyEvent); +@@ -755,7 +756,7 @@ public: + + try + { +- Thread::start(clearDelivery, this, THREAD_high); ++ cleanupSync.run(this); + } + catch (const Exception&) + { +@@ -764,6 +765,12 @@ public: + } + } + ++ void exceptionHandler(const Exception& ex, ThreadFinishSync<MappingIpc*>::ThreadRoutine*) ++ { ++ iscLogException("Fatal error in clearDeliveryThread", ex); ++ fb_utils::logAndDie("Fatal error in clearDeliveryThread"); ++ } ++ + private: + void clearDeliveryThread() + { +@@ -801,13 +808,10 @@ private: + } + if (startup) + startupSemaphore.release(); +- +- cleanupSemaphore.release(); + } + catch (const Exception& ex) + { +- iscLogException("Fatal error in clearDeliveryThread", ex); +- fb_utils::logAndDie("Fatal error in clearDeliveryThread"); ++ exceptionHandler(ex, NULL); + } + } + +@@ -862,11 +866,9 @@ private: + MappingIpc* const data; + }; + +- static THREAD_ENTRY_DECLARE clearDelivery(THREAD_ENTRY_PARAM par) ++ static void clearDelivery(MappingIpc* mapping) + { +- MappingIpc* m = (MappingIpc*)par; +- m->clearDeliveryThread(); +- return 0; ++ mapping->clearDeliveryThread(); + } + + AutoPtr<SharedMemory<MappingHeader> > sharedMemory; +@@ -874,7 +876,7 @@ private: + const SLONG processId; + unsigned process; + Semaphore startupSemaphore; +- Semaphore cleanupSemaphore; ++ ThreadFinishSync<MappingIpc*> cleanupSync; + }; + + GlobalPtr<MappingIpc, InstanceControl::PRIORITY_DELETE_FIRST> mappingIpc; +diff --git a/src/jrd/cch.cpp b/src/jrd/cch.cpp +index e1d403b..1bf714f 100644 +--- a/src/jrd/cch.cpp ++++ b/src/jrd/cch.cpp +@@ -120,14 +120,11 @@ static BufferDesc* alloc_bdb(thread_db*, BufferControl*, UCHAR **); + static Lock* alloc_page_lock(Jrd::thread_db*, BufferDesc*); + static int blocking_ast_bdb(void*); + #ifdef CACHE_READER +-static THREAD_ENTRY_DECLARE cache_reader(THREAD_ENTRY_PARAM); +- + static void prefetch_epilogue(Prefetch*, FbStatusVector *); + static void prefetch_init(Prefetch*, thread_db*); + static void prefetch_io(Prefetch*, FbStatusVector *); + static void prefetch_prologue(Prefetch*, SLONG *); + #endif +-static THREAD_ENTRY_DECLARE cache_writer(THREAD_ENTRY_PARAM); + static void check_precedence(thread_db*, WIN*, PageNumber); + static void clear_precedence(thread_db*, BufferDesc*); + static BufferDesc* dealloc_bdb(BufferDesc*); +@@ -1438,7 +1435,7 @@ void CCH_init2(thread_db* tdbb) + + try + { +- Thread::start(cache_writer, dbb, THREAD_medium); ++ bcb->bcb_writer_fini.run(bcb); + } + catch (const Exception&) + { +@@ -2017,7 +2014,7 @@ void CCH_shutdown(thread_db* tdbb) + { + bcb->bcb_flags &= ~BCB_cache_writer; + bcb->bcb_writer_sem.release(); // Wake up running thread +- bcb->bcb_writer_fini.enter(); ++ bcb->bcb_writer_fini.waitForCompletion(); + } + + SyncLockGuard bcbSync(&bcb->bcb_syncObject, SYNC_EXCLUSIVE, "CCH_shutdown"); +@@ -2692,7 +2689,7 @@ static void flushAll(thread_db* tdbb, USHORT flush_flag) + + + #ifdef CACHE_READER +-static THREAD_ENTRY_DECLARE cache_reader(THREAD_ENTRY_PARAM arg) ++void BufferControl::cache_reader(BufferControl* bcb) + { + /************************************** + * +@@ -2706,7 +2703,7 @@ static THREAD_ENTRY_DECLARE cache_reader(THREAD_ENTRY_PARAM arg) + * busy at a time. + * + **************************************/ +- Database* dbb = (Database*) arg; ++ Database* dbb = bcb->bcb_database; + Database::SyncGuard dsGuard(dbb); + + FbLocalStatus status_vector; +@@ -2846,7 +2843,7 @@ static THREAD_ENTRY_DECLARE cache_reader(THREAD_ENTRY_PARAM arg) + #endif + + +-static THREAD_ENTRY_DECLARE cache_writer(THREAD_ENTRY_PARAM arg) ++void BufferControl::cache_writer(BufferControl* bcb) + { + /************************************** + * +@@ -2859,8 +2856,7 @@ static THREAD_ENTRY_DECLARE cache_writer(THREAD_ENTRY_PARAM arg) + * + **************************************/ + FbLocalStatus status_vector; +- Database* const dbb = (Database*) arg; +- BufferControl* const bcb = dbb->dbb_bcb; ++ Database* const dbb = bcb->bcb_database; + + try + { +@@ -2964,8 +2960,7 @@ static THREAD_ENTRY_DECLARE cache_writer(THREAD_ENTRY_PARAM arg) + } // try + catch (const Firebird::Exception& ex) + { +- ex.stuffException(&status_vector); +- iscDbLogStatus(dbb->dbb_filename.c_str(), &status_vector); ++ bcb->exceptionHandler(ex, cache_writer); + } + + bcb->bcb_flags &= ~BCB_cache_writer; +@@ -2977,15 +2972,19 @@ static THREAD_ENTRY_DECLARE cache_writer(THREAD_ENTRY_PARAM arg) + bcb->bcb_flags &= ~BCB_writer_start; + bcb->bcb_writer_init.release(); + } +- bcb->bcb_writer_fini.release(); + } + catch (const Firebird::Exception& ex) + { +- ex.stuffException(&status_vector); +- iscDbLogStatus(dbb->dbb_filename.c_str(), &status_vector); ++ bcb->exceptionHandler(ex, cache_writer); + } ++} + +- return 0; ++ ++void BufferControl::exceptionHandler(const Firebird::Exception& ex, BcbSync::ThreadRoutine* /*routine*/) ++{ ++ FbLocalStatus status_vector; ++ ex.stuffException(&status_vector); ++ iscDbLogStatus(bcb_database->dbb_filename.c_str(), &status_vector); + } + + +diff --git a/src/jrd/cch.h b/src/jrd/cch.h +index b920566..b7f8486 100644 +--- a/src/jrd/cch.h ++++ b/src/jrd/cch.h +@@ -29,6 +29,7 @@ + #include "../common/classes/RefCounted.h" + #include "../common/classes/semaphore.h" + #include "../common/classes/SyncObject.h" ++#include "../common/ThreadStart.h" + #ifdef SUPERSERVER_V2 + #include "../jrd/sbm.h" + #include "../jrd/pag.h" +@@ -85,7 +86,8 @@ class BufferControl : public pool_alloc<type_bcb> + BufferControl(MemoryPool& p, Firebird::MemoryStats& parentStats) + : bcb_bufferpool(&p), + bcb_memory_stats(&parentStats), +- bcb_memory(p) ++ bcb_memory(p), ++ bcb_writer_fini(p, cache_writer, THREAD_medium) + { + bcb_database = NULL; + QUE_INIT(bcb_in_use); +@@ -144,18 +146,24 @@ public: + Firebird::SyncObject bcb_syncLRU; + //Firebird::SyncObject bcb_syncPageWrite; + ++ typedef ThreadFinishSync<BufferControl*> BcbSync; ++ ++ static void cache_writer(BufferControl* bcb); + Firebird::Semaphore bcb_writer_sem; // Wake up cache writer + Firebird::Semaphore bcb_writer_init; // Cache writer initialization +- Firebird::Semaphore bcb_writer_fini; // Cache writer finalization ++ BcbSync bcb_writer_fini; // Cache writer finalization + #ifdef SUPERSERVER_V2 ++ static void cache_reader(BufferControl* bcb); + // the code in cch.cpp is not tested for semaphore instead event !!! + Firebird::Semaphore bcb_reader_sem; // Wake up cache reader + Firebird::Semaphore bcb_reader_init; // Cache reader initialization +- Firebird::Semaphore bcb_reader_fini; // Cache reader finalization ++ BcbSync bcb_reader_fini; // Cache reader finalization + + PageBitmap* bcb_prefetch; // Bitmap of pages to prefetch + #endif + ++ void exceptionHandler(const Firebird::Exception& ex, BcbSync::ThreadRoutine* routine); ++ + bcb_repeat* bcb_rpt; + }; + +diff --git a/src/jrd/event.cpp b/src/jrd/event.cpp +index 3a6bf28..cb6dc33 100644 +--- a/src/jrd/event.cpp ++++ b/src/jrd/event.cpp +@@ -126,6 +126,7 @@ EventManager::EventManager(const Firebird::string& id, Firebird::RefPtr<Config> + m_processOffset(0), + m_dbId(getPool(), id), + m_config(conf), ++ m_cleanupSync(getPool(), watcher_thread, THREAD_medium), + m_sharedFileCreated(false), + m_exiting(false) + { +@@ -146,7 +147,7 @@ EventManager::~EventManager() + // Terminate the event watcher thread + m_startupSemaphore.tryEnter(5); + (void) m_sharedMemory->eventPost(&m_process->prb_event); +- m_cleanupSemaphore.tryEnter(5); ++ m_cleanupSync.waitForCompletion(); + + #ifdef HAVE_OBJECT_MAP + m_sharedMemory->unmapObject(&localStatus, &m_process); +@@ -697,7 +698,7 @@ void EventManager::create_process() + + release_shmem(); + +- Thread::start(watcher_thread, this, THREAD_medium); ++ m_cleanupSync.run(this); + } + + +@@ -1414,12 +1415,16 @@ void EventManager::watcher_thread() + { + m_startupSemaphore.release(); + } +- m_cleanupSemaphore.release(); + } + catch (const Firebird::Exception& ex) + { +- iscLogException("Error closing event watcher thread\n", ex); ++ exceptionHandler(ex, NULL); + } + } + ++void EventManager::exceptionHandler(const Firebird::Exception& ex, ThreadFinishSync<EventManager*>::ThreadRoutine*) ++{ ++ iscLogException("Error closing event watcher thread\n", ex); ++} ++ + } // namespace +diff --git a/src/jrd/event_proto.h b/src/jrd/event_proto.h +index 3301203..9bfd20e 100644 +--- a/src/jrd/event_proto.h ++++ b/src/jrd/event_proto.h +@@ -63,6 +63,7 @@ public: + + bool initialize(Firebird::SharedMemoryBase*, bool); + void mutexBug(int osErrorCode, const char* text); ++ void exceptionHandler(const Firebird::Exception& ex, ThreadFinishSync<EventManager*>::ThreadRoutine* routine); + + private: + void acquire_shmem(); +@@ -91,11 +92,9 @@ private: + void detach_shared_file(); + void get_shared_file_name(Firebird::PathName&) const; + +- static THREAD_ENTRY_DECLARE watcher_thread(THREAD_ENTRY_PARAM arg) ++ static void watcher_thread(EventManager* eventMgr) + { +- EventManager* const eventMgr = static_cast<EventManager*>(arg); + eventMgr->watcher_thread(); +- return 0; + } + + static void mutex_bugcheck(const TEXT*, int); +@@ -109,7 +108,7 @@ private: + Firebird::AutoPtr<Firebird::SharedMemory<evh> > m_sharedMemory; + + Firebird::Semaphore m_startupSemaphore; +- Firebird::Semaphore m_cleanupSemaphore; ++ ThreadFinishSync<EventManager*> m_cleanupSync; + + bool m_sharedFileCreated; + bool m_exiting; +diff --git a/src/jrd/intl.cpp b/src/jrd/intl.cpp +index 6666c5f..b0e662b 100644 +--- a/src/jrd/intl.cpp ++++ b/src/jrd/intl.cpp +@@ -104,7 +104,6 @@ + #include "../intl/charsets.h" + #include "../intl/country_codes.h" + #include "../common/gdsassert.h" +-//#include "../jrd/license.h" + #ifdef INTL_BUILTIN + #include "../intl/ld_proto.h" + #endif +diff --git a/src/jrd/trace/TraceConfigStorage.h b/src/jrd/trace/TraceConfigStorage.h +index ca973c0..3d08143 100644 +--- a/src/jrd/trace/TraceConfigStorage.h ++++ b/src/jrd/trace/TraceConfigStorage.h +@@ -32,6 +32,7 @@ + #include "../../common/classes/fb_string.h" + #include "../../common/classes/init.h" + #include "../../common/isc_s_proto.h" ++#include "../../common/ThreadStart.h" + #include "../../jrd/trace/TraceSession.h" + #include "../../common/classes/RefCounted.h" + +diff --git a/src/jrd/vio.cpp b/src/jrd/vio.cpp +index 02c5809..8ca9f66 100644 +--- a/src/jrd/vio.cpp ++++ b/src/jrd/vio.cpp +@@ -107,7 +107,6 @@ static bool dfw_should_know(record_param* org_rpb, record_param* new_rpb, + USHORT irrelevant_field, bool void_update_is_relevant = false); + static void garbage_collect(thread_db*, record_param*, ULONG, RecordStack&); + static void garbage_collect_idx(thread_db*, record_param*, Record*, Record*); +-static THREAD_ENTRY_DECLARE garbage_collector(THREAD_ENTRY_PARAM); + + + #ifdef VIO_DEBUG +@@ -1958,7 +1957,7 @@ void VIO_fini(thread_db* tdbb) + { + dbb->dbb_flags &= ~DBB_garbage_collector; + dbb->dbb_gc_sem.release(); // Wake up running thread +- dbb->dbb_gc_fini.enter(); ++ dbb->dbb_gc_fini.waitForCompletion(); + } + } + +@@ -2420,7 +2419,7 @@ void VIO_init(thread_db* tdbb) + { + try + { +- Thread::start(garbage_collector, dbb, THREAD_medium); ++ dbb->dbb_gc_fini.run(dbb); + } + catch (const Exception&) + { +@@ -4741,7 +4740,7 @@ static void garbage_collect_idx(thread_db* tdbb, + } + + +-static THREAD_ENTRY_DECLARE garbage_collector(THREAD_ENTRY_PARAM arg) ++void Database::garbage_collector(Database* dbb) + { + /************************************** + * +@@ -4758,7 +4757,6 @@ static THREAD_ENTRY_DECLARE garbage_collector(THREAD_ENTRY_PARAM arg) + * + **************************************/ + FbLocalStatus status_vector; +- Database* const dbb = (Database*) arg; + + try + { +@@ -4989,8 +4987,7 @@ static THREAD_ENTRY_DECLARE garbage_collector(THREAD_ENTRY_PARAM arg) + } // try + catch (const Firebird::Exception& ex) + { +- ex.stuffException(&status_vector); +- iscDbLogStatus(dbb->dbb_filename.c_str(), &status_vector); ++ dbb->exceptionHandler(ex, NULL); + } + + dbb->dbb_flags &= ~(DBB_garbage_collector | DBB_gc_active | DBB_gc_pending); +@@ -5003,15 +5000,19 @@ static THREAD_ENTRY_DECLARE garbage_collector(THREAD_ENTRY_PARAM arg) + dbb->dbb_flags &= ~DBB_gc_starting; + dbb->dbb_gc_init.release(); + } +- dbb->dbb_gc_fini.release(); + } + catch (const Firebird::Exception& ex) + { +- ex.stuffException(&status_vector); +- iscDbLogStatus(dbb->dbb_filename.c_str(), &status_vector); ++ dbb->exceptionHandler(ex, NULL); + } ++} ++ + +- return 0; ++void Database::exceptionHandler(const Firebird::Exception& ex, ThreadFinishSync<Database*>::ThreadRoutine* /*routine*/) ++{ ++ FbLocalStatus status_vector; ++ ex.stuffException(&status_vector); ++ iscDbLogStatus(dbb_filename.c_str(), &status_vector); + } + + +diff --git a/src/lock/lock.cpp b/src/lock/lock.cpp +index 89eb4c5..2ab3358 100644 +--- a/src/lock/lock.cpp ++++ b/src/lock/lock.cpp +@@ -214,6 +214,7 @@ LockManager::LockManager(const Firebird::string& id, RefPtr<Config> conf) + m_sharedFileCreated(false), + m_process(NULL), + m_processOffset(0), ++ m_cleanupSync(getPool(), blocking_action_thread, THREAD_high), + m_sharedMemory(NULL), + m_blockage(false), + m_dbId(getPool(), id), +@@ -259,7 +260,7 @@ LockManager::~LockManager() + m_sharedMemory->eventPost(&m_process->prc_blocking); + + // Wait for the AST thread to finish cleanup or for 5 seconds +- m_cleanupSemaphore.tryEnter(5); ++ m_cleanupSync.waitForCompletion(); + } + + #ifdef HAVE_OBJECT_MAP +@@ -1548,16 +1549,22 @@ void LockManager::blocking_action_thread() + { + iscLogException("Error in blocking action thread\n", x); + } ++} + +- try +- { +- // Wakeup the main thread waiting for our exit +- m_cleanupSemaphore.release(); +- } +- catch (const Firebird::Exception& x) +- { +- iscLogException("Error closing blocking action thread\n", x); +- } ++ ++void LockManager::exceptionHandler(const Firebird::Exception& ex, ThreadFinishSync<LockManager*>::ThreadRoutine* /*routine*/) ++{ ++/************************************** ++ * ++ * e x c e p t i o n H a n d l e r ++ * ++ ************************************** ++ * ++ * Functional description ++ * Handler for blocking thread close bugs. ++ * ++ **************************************/ ++ iscLogException("Error closing blocking action thread\n", ex); + } + + +@@ -1815,7 +1822,7 @@ bool LockManager::create_process(CheckStatusWrapper* statusVector) + { + try + { +- Thread::start(blocking_action_thread, this, THREAD_high); ++ m_cleanupSync.run(this); + } + catch (const Exception& ex) + { +diff --git a/src/lock/lock_proto.h b/src/lock/lock_proto.h +index d991c1e..2faec49 100644 +--- a/src/lock/lock_proto.h ++++ b/src/lock/lock_proto.h +@@ -418,6 +418,8 @@ public: + SINT64 readData2(USHORT, const UCHAR*, USHORT, SRQ_PTR); + SINT64 writeData(SRQ_PTR, SINT64); + ++ void exceptionHandler(const Firebird::Exception& ex, ThreadFinishSync<LockManager*>::ThreadRoutine* routine); ++ + private: + explicit LockManager(const Firebird::string&, Firebird::RefPtr<Config>); + ~LockManager(); +@@ -471,11 +473,9 @@ private: + void detach_shared_file(Firebird::CheckStatusWrapper*); + void get_shared_file_name(Firebird::PathName&, ULONG extend = 0) const; + +- static THREAD_ENTRY_DECLARE blocking_action_thread(THREAD_ENTRY_PARAM arg) ++ static void blocking_action_thread(LockManager* lockMgr) + { +- LockManager* const lockMgr = static_cast<LockManager*>(arg); + lockMgr->blocking_action_thread(); +- return 0; + } + + bool initialize(Firebird::SharedMemoryBase* sm, bool init); +@@ -490,7 +490,7 @@ private: + Firebird::RWLock m_remapSync; + Firebird::AtomicCounter m_waitingOwners; + +- Firebird::Semaphore m_cleanupSemaphore; ++ ThreadFinishSync<LockManager*> m_cleanupSync; + Firebird::Semaphore m_startupSemaphore; + + public: +diff --git a/src/qli/command.cpp b/src/qli/command.cpp +index 5f949f3..fbbf4fb 100644 +--- a/src/qli/command.cpp ++++ b/src/qli/command.cpp +@@ -30,7 +30,6 @@ + #include "../qli/parse.h" + #include "../qli/compile.h" + #include "../qli/exe.h" +-//#include "../jrd/license.h" + #include "../qli/all_proto.h" + #include "../qli/err_proto.h" + #include "../qli/exe_proto.h" +diff --git a/src/qli/dtr.h b/src/qli/dtr.h +index ba5cd64..e246ef4 100644 +--- a/src/qli/dtr.h ++++ b/src/qli/dtr.h +@@ -480,7 +480,6 @@ struct qli_fun + }; + + // Program wide globals +-//#include <setjmp.h> + + #ifdef QLI_MAIN + #define EXTERN +diff --git a/src/qli/lex.cpp b/src/qli/lex.cpp +index c20d1f9..9e26046 100644 +--- a/src/qli/lex.cpp ++++ b/src/qli/lex.cpp +@@ -50,10 +50,6 @@ using MsgFormat::SafeArg; + #include <unistd.h> + #endif + +-//#ifdef HAVE_CTYPES_H +-//#include <ctypes.h> +-//#endif +- + #ifdef HAVE_IO_H + #include <io.h> // isatty + #endif +diff --git a/src/qli/meta.epp b/src/qli/meta.epp +index a7f222c..2d55716 100644 +--- a/src/qli/meta.epp ++++ b/src/qli/meta.epp +@@ -28,7 +28,6 @@ + #include "../qli/dtr.h" + #include "../qli/compile.h" + #include "../qli/exe.h" +-//#include "../jrd/license.h" + #include "../jrd/flags.h" + #include "../jrd/ibase.h" + #include "../qli/reqs.h" +diff --git a/src/utilities/gsec/gsecswi.h b/src/utilities/gsec/gsecswi.h +index b8519f5..9b560e3 100644 +--- a/src/utilities/gsec/gsecswi.h ++++ b/src/utilities/gsec/gsecswi.h +@@ -24,7 +24,6 @@ + #ifndef GSEC_GSECSWI_H + #define GSEC_GSECSWI_H + +-//#include "../common/common.h" + #include "../jrd/constants.h" + + /* Switch handling constants. Note that the first IN_SW_DATA_ITEMS +diff --git a/src/utilities/gstat/dba.epp b/src/utilities/gstat/dba.epp +index 379b418..19b99d1 100644 +--- a/src/utilities/gstat/dba.epp ++++ b/src/utilities/gstat/dba.epp +@@ -56,6 +56,7 @@ + #include "../common/classes/UserBlob.h" + #include "../common/os/os_utils.h" + #include "../common/StatusHolder.h" ++#include "../common/ThreadStart.h" + + using MsgFormat::SafeArg; + +diff --git a/src/utilities/nbackup/nbkswi.h b/src/utilities/nbackup/nbkswi.h +index 4326c3d..b8d43da 100644 +--- a/src/utilities/nbackup/nbkswi.h ++++ b/src/utilities/nbackup/nbkswi.h +@@ -27,7 +27,6 @@ + #ifndef NBACKUP_NBKSWI_H + #define NBACKUP_NBKSWI_H + +-//#include "../common/common.h" + #include "../jrd/constants.h" + + // Switch handling constants +diff --git a/src/utilities/ntrace/os/win32/FileObject.cpp b/src/utilities/ntrace/os/win32/FileObject.cpp +index 73ed38f..53fbfc0 100644 +--- a/src/utilities/ntrace/os/win32/FileObject.cpp ++++ b/src/utilities/ntrace/os/win32/FileObject.cpp +@@ -27,7 +27,6 @@ + + #include "firebird.h" + #include "../FileObject.h" +-//#include "../common/classes/locks.h" + + using namespace Firebird; + Firebird::Mutex open_mutex; +diff --git a/src/yvalve/gds.cpp b/src/yvalve/gds.cpp +index c851f7c..998bbde 100644 +--- a/src/yvalve/gds.cpp ++++ b/src/yvalve/gds.cpp +@@ -57,6 +57,7 @@ + #include "../common/classes/init.h" + #include "../common/classes/TempFile.h" + #include "../common/utils_proto.h" ++#include "../common/ThreadStart.h" + + #ifdef HAVE_UNISTD_H + #include <unistd.h> +diff --git a/src/yvalve/preparse.cpp b/src/yvalve/preparse.cpp +index b2335a5..e742784 100644 +--- a/src/yvalve/preparse.cpp ++++ b/src/yvalve/preparse.cpp +@@ -25,7 +25,6 @@ + #include "firebird.h" + #include <stdlib.h> + #include <string.h> +-//#include "../dsql/chars.h" + #include "../yvalve/prepa_proto.h" + #include "../yvalve/gds_proto.h" + #include "../yvalve/YObjects.h" +--- a/src/common/isc_sync.cpp ++++ b/src/common/isc_sync.cpp +@@ -67,6 +67,7 @@ + #include "../common/classes/RefMutex.h" + #include "../common/classes/array.h" + #include "../common/StatusHolder.h" ++#include "../common/ThreadStart.h" + + static int process_id; + +-- +2.9.3 + diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk new file mode 100644 index 000000000..87df3567e --- /dev/null +++ b/external/firebird/ExternalPackage_firebird.mk @@ -0,0 +1,28 @@ +# -*- 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_ExternalPackage_ExternalPackage,firebird,firebird)) + +$(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) + +ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbclient.dll,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/bin/ifbclient.dll)) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/Engine12.dll,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/Engine12.dll)) +else ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.dylib.3.0.0,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0)) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.dylib,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.dylib)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.so.2,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.so.3.0.0)) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.so,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.so)) +endif + +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/firebird.msg,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/firebird.msg)) +$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/security3.fdb,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/security3.fdb)) + +# vim: set noet sw=4 ts=4: diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk new file mode 100644 index 000000000..ce99e909a --- /dev/null +++ b/external/firebird/ExternalProject_firebird.mk @@ -0,0 +1,116 @@ +# -*- 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,firebird)) + +$(eval $(call gb_ExternalProject_use_autoconf,firebird,build)) + +$(eval $(call gb_ExternalProject_use_externals,firebird,\ + boost_headers \ + icu \ + libatomic_ops \ + libtommath \ +)) + +$(eval $(call gb_ExternalProject_register_targets,firebird,\ + build \ +)) + +ifneq ($(OS),WNT) +INVOKE_FPA:="CPU=\$$(EMPTY) $${FB_CPU_ARG}" +endif + +ifeq ($(COM_IS_CLANG),TRUE) +firebird_NO_CXX11_NARROWING := -Wno-c++11-narrowing +endif + +MAKE_PRE=LC_ALL=C + +MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \ + $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.dylib \ + $(EXTERNAL_WORKDIR)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0) + +$(call gb_ExternalProject_get_state_target,firebird,build): + $(call gb_Trace_StartRange,firebird,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + unset MAKEFLAGS \ + && FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))' \ + && export PKG_CONFIG="" \ + && export CPPFLAGS=" \ + $(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_CFLAGS), \ + -I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \ + ) \ + $(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \ + -I$(call gb_UnpackedTarball_get_dir,libtommath) \ + -L$(call gb_UnpackedTarball_get_dir,libtommath) \ + ) \ + $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ + ) \ + $(if $(filter GCC-INTEL,$(COM)-$(CPUNAME)),-Di386=1) \ + " \ + && export CXXFLAGS=" \ + $(if $(filter MSC,$(COM)),$(if $(MSVC_USE_DEBUG_RUNTIME),-DMSVC_USE_DEBUG_RUNTIME)) \ + $(if $(HAVE_GCC_FNO_SIZED_DEALLOCATION),-fno-sized-deallocation -fno-delete-null-pointer-checks) \ + $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \ + $(BOOST_CPPFLAGS) \ + -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ + ) \ + $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ + ) \ + $(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \ + -L$(call gb_UnpackedTarball_get_dir,libtommath) \ + ) \ + $(CXXFLAGS_CXX11) \ + $(firebird_NO_CXX11_NARROWING) \ + $(if $(call gb_Module__symbols_enabled,firebird),$(gb_DEBUGINFO_FLAGS)) \ + " \ + && export LDFLAGS=" \ + $(if $(SYSTEM_ICU),$(ICU_LIBS), \ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ + ) \ + " \ + && export LIBREOFFICE_ICU_LIB="$(call gb_UnpackedTarball_get_dir,icu)/source/lib" \ + && MAKE=$(MAKE) ./configure \ + --without-editline \ + --with-wire-compress=no \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + $(if $(filter MACOSX,$(OS)), \ + $(if $(filter 1, \ + $(shell expr '$(MAC_OS_X_VERSION_MIN_REQUIRED)' \ + '<' 101200)), \ + ac_cv_func_clock_gettime=no)) \ + && if [ -n "$${FB_CPU_ARG}" ]; then \ + $(MAKE_PRE) $(MAKE) \ + $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \ + $(if $(ENABLE_DEBUG),Debug) $(INVOKE_FPA) SHELL='$(SHELL)' \ + LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib)))' \ + $(MAKE_POST); \ + else \ + $(MAKE_PRE) $(MAKE) \ + $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \ + $(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' \ + LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib)))' \ + $(MAKE_POST); \ + fi \ + ) + $(call gb_Trace_EndRange,firebird,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/firebird/Makefile b/external/firebird/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/firebird/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/firebird/Module_firebird.mk b/external/firebird/Module_firebird.mk new file mode 100644 index 000000000..d74963f7f --- /dev/null +++ b/external/firebird/Module_firebird.mk @@ -0,0 +1,18 @@ +# -*- 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,firebird)) + +$(eval $(call gb_Module_add_targets,firebird,\ + ExternalPackage_firebird \ + ExternalProject_firebird \ + UnpackedTarball_firebird \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/firebird/README b/external/firebird/README new file mode 100644 index 000000000..cc7c72743 --- /dev/null +++ b/external/firebird/README @@ -0,0 +1,3 @@ +Firebird is an embeddable SQL RDBMS implemented in C++ + +http://firebirdsql.org/ diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk new file mode 100644 index 000000000..a8507db38 --- /dev/null +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -0,0 +1,63 @@ +# -*- 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,firebird)) + +$(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,firebird,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,firebird,\ + builds/make.new/config \ + extern/editline \ +)) + +# * external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 is upstream at +# <https://github.com/FirebirdSQL/firebird/pull/227> "Make comparison operator member functions +# const": +$(eval $(call gb_UnpackedTarball_add_patches,firebird,\ + external/firebird/firebird.disable-ib-util-not-found.patch.1 \ + external/firebird/firebird-Engine12.patch \ + external/firebird/firebird-rpath.patch.0 \ + external/firebird/firebird-cloop-compiler.patch.1 \ + external/firebird/firebird-gcc6.patch.1 \ + external/firebird/wnt-dbgutil.patch \ + external/firebird/libc++.patch \ + external/firebird/0001-Avoid-hangup-in-SS-when-error-happens-at-system-atta.patch.1 \ + external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1 \ + external/firebird/c++17.patch \ + external/firebird/ubsan.patch \ + external/firebird/asan.patch \ + external/firebird/firebird-tdf125284.patch.1 \ + external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 \ + external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1 \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,firebird,\ + external/firebird/firebird-cygwin-msvc.patch \ + external/firebird/firebird-vs2017.patch.1 \ +)) +endif + +ifeq ($(OS),MACOSX) +$(eval $(call gb_UnpackedTarball_add_patches,firebird,\ + external/firebird/firebird-configure-x86-64-macosx.patch.1 \ + external/firebird/firebird-macosx.patch.1 \ + external/firebird/macosx-elcapitan-dyld.patch \ +)) +endif + +ifneq ($(filter -fsanitize=%,$(CC)),) +$(eval $(call gb_UnpackedTarball_add_patches,firebird, \ + external/firebird/sanitizer.patch \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch new file mode 100644 index 000000000..5ee7744e1 --- /dev/null +++ b/external/firebird/asan.patch @@ -0,0 +1,252 @@ +--- builds/posix/Makefile.in ++++ builds/posix/Makefile.in +@@ -323,8 +323,8 @@ + + metadata.fdb: $(RUN_ISQL) $(SRC_ROOT)/dbs/metadata.sql + -$(RM) $@ +- $(RUN_ISQL) -q -i $(SRC_ROOT)/dbs/metadata.sql +- $(RUN_GFIX) -mode read_only $@ ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(RUN_ISQL) -q -i $(SRC_ROOT)/dbs/metadata.sql ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(RUN_GFIX) -mode read_only $@ + $(CHMOD) 0444 $@ + + $(HELP_FDB): help.fdb +@@ -333,7 +333,7 @@ + $(CHMOD) 0444 $@ + + help.fdb: $(BLD_ROOT)/misc/help.gbak +- $(RUN_GBAK) -MODE read_only -R $< $@ ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(RUN_GBAK) -MODE read_only -R $< $@ + $(CHMOD) 0444 $@ + + $(SECURITY_FDB): security.fdb +@@ -343,18 +343,18 @@ + security.fdb: $(SRC_ROOT)/dbs/security.sql + -$(RM) $@ + -$(RM) $(SECURITY_TMP) +- echo create database \'$(SECURITY_TMP)\'\; | $(RUN_ISQL) +- $(RUN_GFIX) -write async $(SECURITY_TMP) +- $(RUN_ISQL) -i $^ $(SECURITY_TMP) ++ echo create database \'$(SECURITY_TMP)\'\; | $(LIBO_TUNNEL_LIBRARY_PATH) $(RUN_ISQL) ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(RUN_GFIX) -write async $(SECURITY_TMP) ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(RUN_ISQL) -i $^ $(SECURITY_TMP) + $(CHMOD) a=rw $(SECURITY_TMP) + $(CP) $(SECURITY_TMP) $@ +- $(RUN_GFIX) -write sync $@ ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(RUN_GFIX) -write sync $@ + + msg.timestamp: $(MSG_FILES) + -$(RM) msg.fdb +- echo create database \'msg.fdb\'\; | $(RUN_ISQL) +- $(RUN_GFIX) -write async msg.fdb +- for sql in $(MSG_FILES); do (echo $$sql; $(RUN_ISQL) -i $$sql msg.fdb) || exit; done ++ echo create database \'msg.fdb\'\; | $(LIBO_TUNNEL_LIBRARY_PATH) $(RUN_ISQL) ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(RUN_GFIX) -write async msg.fdb ++ for sql in $(MSG_FILES); do (echo $$sql; $(LIBO_TUNNEL_LIBRARY_PATH) $(RUN_ISQL) -i $$sql msg.fdb) || exit; done + $(TOUCH) $@ + + +@@ -560,7 +560,7 @@ + message_file: $(FIREBIRD_MSG) + + $(FIREBIRD_MSG): $(BUILD_FILE) msg.timestamp +- $(BUILD_FILE) -d msg.fdb -f $@ ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(BUILD_FILE) -d msg.fdb -f $@ + $(CHMOD_6) $@ + + $(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB) +--- builds/posix/Makefile.in.examples ++++ builds/posix/Makefile.in.examples +@@ -123,8 +123,8 @@ + + $(EMPLOYEE_DB): $(EXAMPLES_DEST)/empbuild$(EXEC_EXT) $(INPUT_Sources) $(EXAMPLES_DEST)/isql$(EXEC_EXT) + -$(RM) $(EMPLOYEE_DB) +- ./empbuild $(EMPLOYEE_DB) +- $(GFIX) -write sync $(EMPLOYEE_DB) ++ $(LIBO_TUNNEL_LIBRARY_PATH) ./empbuild $(EMPLOYEE_DB) ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(GFIX) -write sync $(EMPLOYEE_DB) + -$(CHMOD_6) $(EMPLOYEE_DB) + + # To get past the fact isql is called from the programs, we create a local link in this directory +@@ -140,7 +140,7 @@ + + $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql $(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT) + -$(RM) $(EXAMPLES_DEST)/empbuild.fdb +- $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i empbld.sql ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i empbld.sql + + # The chain for intlemp.fdb is the same a script file to create an empty database + # to allow a .e program to be compiled, to then create and populate with data +@@ -158,7 +158,7 @@ + + $(EXAMPLES_DEST)/intlbuild.fdb : $(EXAMPLES_DEST)/intlddl.sql $(EXAMPLES_DEST)/intlbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT) + -$(RM) intlbuild.fdb +- $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i intlbld.sql ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i intlbld.sql + + + $(EXAMPLES_DEST)/%.sql: $(EXAMPLES_SRC)/empbuild/%.sql +--- builds/posix/make.rules ++++ builds/posix/make.rules +@@ -68,17 +68,17 @@ + .SUFFIXES: .c .e .epp .cpp + + .e.c: +- $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ + + + $(OBJ)/jrd/%.cpp: $(SRC_ROOT)/jrd/%.epp +- $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $(firstword $<) $@ ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $(firstword $<) $@ + + $(OBJ)/isql/%.cpp: $(SRC_ROOT)/isql/%.epp +- $(GPRE_CURRENT) $(ISQL_GPRE_FLAGS) $< $@ ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(GPRE_CURRENT) $(ISQL_GPRE_FLAGS) $< $@ + + $(OBJ)/%.cpp: $(SRC_ROOT)/%.epp +- $(GPRE_CURRENT) $(GPRE_FLAGS) $(firstword $<) $@ ++ $(LIBO_TUNNEL_LIBRARY_PATH) $(GPRE_CURRENT) $(GPRE_FLAGS) $(firstword $<) $@ + + + .SUFFIXES: .lo .o .cpp .c +--- src/common/classes/alloc.cpp ++++ src/common/classes/alloc.cpp +@@ -2187,7 +2187,7 @@ + + void* MemPool::allocRaw(size_t size) + { +-#ifndef USE_VALGRIND ++#if !(defined USE_VALGRIND || defined USE_ASAN) + if (size == DEFAULT_ALLOCATION) + { + MutexLockGuard guard(*cache_mutex, "MemPool::allocRaw"); +@@ -2267,7 +2267,7 @@ + + void MemPool::releaseRaw(bool destroying, void* block, size_t size, bool use_cache) throw () + { +-#ifndef USE_VALGRIND ++#if !(defined USE_VALGRIND || defined USE_ASAN) + if (use_cache && (size == DEFAULT_ALLOCATION)) + { + MutexLockGuard guard(*cache_mutex, "MemPool::releaseRaw"); +@@ -2277,7 +2277,7 @@ + return; + } + } +-#else ++#elif defined USE_VALGRIND + // Set access protection for block to prevent memory from deleted pool being accessed + int handle = /* //VALGRIND_MAKE_NOACCESS */ VALGRIND_MAKE_MEM_DEFINED(block, size); + +--- src/common/classes/alloc.h ++++ src/common/classes/alloc.h +@@ -295,40 +295,60 @@ + + // operators new and delete + ++#if !defined USE_ASAN + inline void* operator new(size_t s ALLOC_PARAMS) + { + return MemoryPool::globalAlloc(s ALLOC_PASS_ARGS); + } + inline void* operator new[](size_t s ALLOC_PARAMS) + { + return MemoryPool::globalAlloc(s ALLOC_PASS_ARGS); + } ++#endif + + inline void* operator new(size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS) + { ++#if defined USE_ASAN ++ return operator new(s); ++#else + return pool.allocate(s ALLOC_PASS_ARGS); ++#endif + } + inline void* operator new[](size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS) + { ++#if defined USE_ASAN ++ return operator new[](s); ++#else + return pool.allocate(s ALLOC_PASS_ARGS); ++#endif + } + ++#if !defined USE_ASAN + inline void operator delete(void* mem ALLOC_PARAMS) throw() + { + MemoryPool::globalFree(mem); + } + inline void operator delete[](void* mem ALLOC_PARAMS) throw() + { + MemoryPool::globalFree(mem); + } ++#endif + + inline void operator delete(void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS) throw() + { ++#if defined USE_ASAN ++ return operator delete(mem); ++#else + MemoryPool::globalFree(mem); ++#endif + } + inline void operator delete[](void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS) throw() + { ++#if defined USE_ASAN ++ return operator delete[](mem); ++#else + MemoryPool::globalFree(mem); ++#endif + } + + #ifdef DEBUG_GDS_ALLOC +--- src/include/firebird.h ++++ src/include/firebird.h +@@ -38,8 +38,17 @@ + #include "gen/autoconfig.h" + #endif + ++#if defined __clang__ ++//#if __has_feature(address_sanitizer) ++#define USE_ASAN ++//#endif ++#endif ++#if defined __SANITIZE_ADDRESS__ ++#define USE_ASAN ++#endif ++ + // Using our debugging code is pointless when we may use Valgrind features +-#if defined(DEV_BUILD) && !defined(USE_VALGRIND) ++#if defined(DEV_BUILD) && !(defined(USE_VALGRIND) || defined(USE_ASAN)) + #define DEBUG_GDS_ALLOC + #endif + +--- src/jrd/SimilarToMatcher.h ++++ src/jrd/SimilarToMatcher.h +@@ -338,7 +338,7 @@ + private: + static const unsigned INCREASE_FACTOR = 50; + unsigned size; +- AutoPtr<UCHAR> data; ++ AutoPtr<UCHAR, ArrayDelete<UCHAR>> data; + T* end; + }; + #endif // RECURSIVE_SIMILAR +--- configure.orig 2018-06-03 17:44:50.152951348 +0200 ++++ configure 2018-06-03 17:45:11.708907807 +0200 +@@ -18479,11 +18479,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char dlopen (); ++char dlsym (); + int + main () + { +-return dlopen (); ++return dlsym (); + ; + return 0; + } diff --git a/external/firebird/c++17.patch b/external/firebird/c++17.patch new file mode 100644 index 000000000..f5ac666ba --- /dev/null +++ b/external/firebird/c++17.patch @@ -0,0 +1,301 @@ +--- src/common/DynamicStrings.cpp ++++ src/common/DynamicStrings.cpp +@@ -37,7 +37,7 @@ + + namespace Firebird { + +-unsigned makeDynamicStrings(unsigned length, ISC_STATUS* const dst, const ISC_STATUS* const src) throw(BadAlloc) ++unsigned makeDynamicStrings(unsigned length, ISC_STATUS* const dst, const ISC_STATUS* const src) + { + const ISC_STATUS* end = &src[length]; + +--- src/common/DynamicStrings.h ++++ src/common/DynamicStrings.h +@@ -34,7 +34,7 @@ + + namespace Firebird { + +-unsigned makeDynamicStrings(unsigned len, ISC_STATUS* const dst, const ISC_STATUS* const src) throw(BadAlloc); ++unsigned makeDynamicStrings(unsigned len, ISC_STATUS* const dst, const ISC_STATUS* const src); + char* findDynamicStrings(unsigned len, ISC_STATUS* ptr) throw(); + + } // namespace Firebird +--- src/common/StatusArg.cpp ++++ src/common/StatusArg.cpp +@@ -53,7 +53,7 @@ + + namespace Arg { + +-Base::Base(ISC_STATUS k, ISC_STATUS c) throw(Firebird::BadAlloc) : ++Base::Base(ISC_STATUS k, ISC_STATUS c) : + implementation(FB_NEW_POOL(*getDefaultMemoryPool()) ImplBase(k, c)) + { + } +@@ -94,28 +94,28 @@ + assign(ex); + } + +-StatusVector::StatusVector(ISC_STATUS k, ISC_STATUS c) throw(Firebird::BadAlloc) : ++StatusVector::StatusVector(ISC_STATUS k, ISC_STATUS c) : + Base(FB_NEW_POOL(*getDefaultMemoryPool()) ImplStatusVector(k, c)) + { + operator<<(*(static_cast<Base*>(this))); + } + +-StatusVector::StatusVector(const ISC_STATUS* s) throw(Firebird::BadAlloc) : ++StatusVector::StatusVector(const ISC_STATUS* s) : + Base(FB_NEW_POOL(*getDefaultMemoryPool()) ImplStatusVector(s)) + { + } + +-StatusVector::StatusVector(const IStatus* s) throw(Firebird::BadAlloc) : ++StatusVector::StatusVector(const IStatus* s) : + Base(FB_NEW_POOL(*getDefaultMemoryPool()) ImplStatusVector(s)) + { + } + +-StatusVector::StatusVector(const Exception& ex) throw(Firebird::BadAlloc) : ++StatusVector::StatusVector(const Exception& ex) : + Base(FB_NEW_POOL(*getDefaultMemoryPool()) ImplStatusVector(ex)) + { + } + +-StatusVector::StatusVector() throw(Firebird::BadAlloc) : ++StatusVector::StatusVector() : + Base(FB_NEW_POOL(*getDefaultMemoryPool()) ImplStatusVector(0, 0)) + { + } +--- src/common/StatusArg.h ++++ src/common/StatusArg.h +@@ -86,7 +86,7 @@ + virtual ~ImplBase() { } + }; + +- Base(ISC_STATUS k, ISC_STATUS c) throw(Firebird::BadAlloc); ++ Base(ISC_STATUS k, ISC_STATUS c); + explicit Base(ImplBase* i) throw() : implementation(i) { } + ~Base() throw() { delete implementation; } + +@@ -142,13 +142,13 @@ + explicit ImplStatusVector(const Exception& ex) throw(); + }; + +- StatusVector(ISC_STATUS k, ISC_STATUS v) throw(Firebird::BadAlloc); ++ StatusVector(ISC_STATUS k, ISC_STATUS v); + + public: +- explicit StatusVector(const ISC_STATUS* s) throw(Firebird::BadAlloc); +- explicit StatusVector(const IStatus* s) throw(Firebird::BadAlloc); +- explicit StatusVector(const Exception& ex) throw(Firebird::BadAlloc); +- StatusVector() throw(Firebird::BadAlloc); ++ explicit StatusVector(const ISC_STATUS* s); ++ explicit StatusVector(const IStatus* s); ++ explicit StatusVector(const Exception& ex); ++ StatusVector(); + ~StatusVector() { } + + const ISC_STATUS* value() const throw() { return implementation->value(); } +--- src/common/classes/alloc.cpp ++++ src/common/classes/alloc.cpp +@@ -1431,7 +1431,7 @@ + + ~FreeObjects(); + +- FreeObjPtr allocateBlock(MemPool* pool, size_t from, size_t& size) throw (OOM_EXCEPTION) ++ FreeObjPtr allocateBlock(MemPool* pool, size_t from, size_t& size) + { + size_t full_size = size + (from ? 0 : ListBuilder::MEM_OVERHEAD); + if (full_size > Limits::TOP_LIMIT) +@@ -1498,7 +1498,7 @@ + ListBuilder listBuilder; + Extent* currentExtent; + +- MemBlock* newBlock(MemPool* pool, unsigned slot) throw (OOM_EXCEPTION); ++ MemBlock* newBlock(MemPool* pool, unsigned slot); + }; + + +@@ -1538,26 +1538,26 @@ + AtomicCounter used_memory, mapped_memory; + + private: +- MemBlock* alloc(size_t from, size_t& length, bool flagRedirect) throw (OOM_EXCEPTION); ++ MemBlock* alloc(size_t from, size_t& length, bool flagRedirect); + void releaseBlock(MemBlock *block) throw (); + + public: +- void* allocate(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION); +- MemBlock* allocate2(size_t from, size_t& size ALLOC_PARAMS) throw (OOM_EXCEPTION); ++ void* allocate(size_t size ALLOC_PARAMS); ++ MemBlock* allocate2(size_t from, size_t& size ALLOC_PARAMS); + + private: +- virtual void memoryIsExhausted(void) throw (OOM_EXCEPTION); +- void* allocRaw(size_t length) throw (OOM_EXCEPTION); ++ virtual void memoryIsExhausted(void); ++ void* allocRaw(size_t length); + static void release(void* block, bool flagDecr) throw (); + static void releaseRaw(bool destroying, void *block, size_t size, bool use_cache = true) throw (); +- void* getExtent(size_t from, size_t& to) throw (OOM_EXCEPTION); ++ void* getExtent(size_t from, size_t& to); + + public: + static void releaseExtent(bool destroying, void *block, size_t size, MemPool* pool) throw (); + + // pass desired size, return actual extent size + template <class Extent> +- void newExtent(size_t& size, Extent** linkedList) throw (OOM_EXCEPTION); ++ void newExtent(size_t& size, Extent** linkedList); + + private: + #ifdef USE_VALGRIND +@@ -1667,7 +1667,7 @@ + + + template <class ListBuilder, class Limits> +-MemBlock* FreeObjects<ListBuilder, Limits>::newBlock(MemPool* pool, unsigned slot) throw (OOM_EXCEPTION) ++MemBlock* FreeObjects<ListBuilder, Limits>::newBlock(MemPool* pool, unsigned slot) + { + size_t size = Limits::getSize(slot); + +@@ -1902,7 +1902,7 @@ + } + + template <class Extent> +-void MemPool::newExtent(size_t& size, Extent** linkedList) throw(OOM_EXCEPTION) ++void MemPool::newExtent(size_t& size, Extent** linkedList) + { + // No large enough block found. We need to extend the pool + void* memory = NULL; +@@ -1967,7 +1967,7 @@ + pool->setStatsGroup(newStats); + } + +-MemBlock* MemPool::alloc(size_t from, size_t& length, bool flagRedirect) throw (OOM_EXCEPTION) ++MemBlock* MemPool::alloc(size_t from, size_t& length, bool flagRedirect) + { + MutexEnsureUnlock guard(mutex, "MemPool::alloc"); + guard.enter(); +@@ -2026,7 +2026,7 @@ + #ifdef DEBUG_GDS_ALLOC + , const char* fileName, int line + #endif +-) throw (OOM_EXCEPTION) ++) + { + size_t length = from ? size : ROUNDUP(size + VALGRIND_REDZONE, roundingSize) + GUARD_BYTES; + MemBlock* memory = alloc(from, length, true); +@@ -2055,7 +2055,7 @@ + } + + +-void* MemPool::allocate(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION) ++void* MemPool::allocate(size_t size ALLOC_PARAMS) + { + MemBlock* memory = allocate2(0, size ALLOC_PASS_ARGS); + +@@ -2180,12 +2180,12 @@ + releaseRaw(pool_destroying, hunk, hunk->length, false); + } + +-void MemPool::memoryIsExhausted(void) throw (OOM_EXCEPTION) ++void MemPool::memoryIsExhausted(void) + { + Firebird::BadAlloc::raise(); + } + +-void* MemPool::allocRaw(size_t size) throw (OOM_EXCEPTION) ++void* MemPool::allocRaw(size_t size) + { + #ifndef USE_VALGRIND + if (size == DEFAULT_ALLOCATION) +@@ -2245,7 +2245,7 @@ + } + + +-void* MemPool::getExtent(size_t from, size_t& to) throw(OOM_EXCEPTION) // pass desired minimum size, return actual extent size ++void* MemPool::getExtent(size_t from, size_t& to) // pass desired minimum size, return actual extent size + { + MemBlock* extent = allocate2(from, to ALLOC_ARGS); + return &extent->body; +@@ -2348,7 +2348,7 @@ + deallocate(block); + } + +-void* MemoryPool::calloc(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION) ++void* MemoryPool::calloc(size_t size ALLOC_PARAMS) + { + void* block = allocate(size ALLOC_PASS_ARGS); + memset(block, 0, size); +@@ -2489,7 +2489,7 @@ + MemPool::globalFree(block); + } + +-void* MemoryPool::allocate(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION) ++void* MemoryPool::allocate(size_t size ALLOC_PARAMS) + { + return pool->allocate(size ALLOC_PASS_ARGS); + } +@@ -2547,11 +2547,11 @@ + // in a case when we actually need "new" only with file/line information + // this version should be also present as a pair for "delete". + #ifdef DEBUG_GDS_ALLOC +-void* operator new(size_t s) throw (OOM_EXCEPTION) ++void* operator new(size_t s) + { + return MemoryPool::globalAlloc(s ALLOC_ARGS); + } +-void* operator new[](size_t s) throw (OOM_EXCEPTION) ++void* operator new[](size_t s) + { + return MemoryPool::globalAlloc(s ALLOC_ARGS); + } +--- src/common/classes/alloc.h ++++ src/common/classes/alloc.h +@@ -186,18 +186,18 @@ + #define ALLOC_PASS_ARGS + #endif // DEBUG_GDS_ALLOC + +- void* calloc(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION); ++ void* calloc(size_t size ALLOC_PARAMS); + + #ifdef LIBC_CALLS_NEW + static void* globalAlloc(size_t s ALLOC_PARAMS) throw (OOM_EXCEPTION); + #else +- static void* globalAlloc(size_t s ALLOC_PARAMS) throw (OOM_EXCEPTION) ++ static void* globalAlloc(size_t s ALLOC_PARAMS) + { + return defaultMemoryManager->allocate(s ALLOC_PASS_ARGS); + } + #endif // LIBC_CALLS_NEW + +- void* allocate(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION); ++ void* allocate(size_t size ALLOC_PARAMS); + + static void globalFree(void* mem) throw (); + void deallocate(void* mem) throw (); +@@ -295,20 +295,20 @@ + + // operators new and delete + +-inline void* operator new(size_t s ALLOC_PARAMS) throw (OOM_EXCEPTION) ++inline void* operator new(size_t s ALLOC_PARAMS) + { + return MemoryPool::globalAlloc(s ALLOC_PASS_ARGS); + } +-inline void* operator new[](size_t s ALLOC_PARAMS) throw (OOM_EXCEPTION) ++inline void* operator new[](size_t s ALLOC_PARAMS) + { + return MemoryPool::globalAlloc(s ALLOC_PASS_ARGS); + } + +-inline void* operator new(size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS) throw (OOM_EXCEPTION) ++inline void* operator new(size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS) + { + return pool.allocate(s ALLOC_PASS_ARGS); + } +-inline void* operator new[](size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS) throw (OOM_EXCEPTION) ++inline void* operator new[](size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS) + { + return pool.allocate(s ALLOC_PASS_ARGS); + } diff --git a/external/firebird/firebird-Engine12.patch b/external/firebird/firebird-Engine12.patch new file mode 100644 index 000000000..f6590b300 --- /dev/null +++ b/external/firebird/firebird-Engine12.patch @@ -0,0 +1,16 @@ +--- src/common/utils.cpp ++++ src/common/utils.cpp +@@ -1026,6 +1026,13 @@ + PathUtils::concatPath(s, configDir[prefType], name); + return s; + } ++ ++ // Set relative path to Engine12 dynamic library ++ if(prefType == Firebird::IConfigManager::DIR_PLUGINS) ++ { ++ s = name; ++ return s; ++ } + } + + switch(prefType) diff --git a/external/firebird/firebird-cloop-compiler.patch.1 b/external/firebird/firebird-cloop-compiler.patch.1 new file mode 100644 index 000000000..ac82bb0ca --- /dev/null +++ b/external/firebird/firebird-cloop-compiler.patch.1 @@ -0,0 +1,12 @@ +diff -ur firebird.org/extern/cloop/Makefile firebird/extern/cloop/Makefile +--- firebird.org/extern/cloop/Makefile 2016-08-17 18:32:59.078044357 +0200 ++++ firebird/extern/cloop/Makefile 2016-08-17 18:33:14.430518561 +0200 +@@ -4,8 +4,6 @@ + + TARGET := release + +-CC := gcc +-CXX := g++ + LD := $(CXX) + + SRC_DIR := src diff --git a/external/firebird/firebird-configure-x86-64-macosx.patch.1 b/external/firebird/firebird-configure-x86-64-macosx.patch.1 new file mode 100644 index 000000000..99a7d2db8 --- /dev/null +++ b/external/firebird/firebird-configure-x86-64-macosx.patch.1 @@ -0,0 +1,20 @@ +--- firebird.org/configure 2015-03-27 16:00:42.000000000 +0200 ++++ firebird/configure 2015-06-09 15:33:26.000000000 +0300 +@@ -2903,7 +2903,7 @@ + ;; + + i*86-*-darwin*) +- MAKEFILE_PREFIX=darwin_i386 ++ MAKEFILE_PREFIX=darwin_x86_64 + MAKEFILE_POSTFIX=darwin + PLATFORM=DARWIN + INSTALL_PREFIX=darwin +@@ -2913,7 +2913,7 @@ + LIBS="$LIBS -framework CoreFoundation" + EDITLINE_FLG=Y + SHRLIB_EXT=dylib +- CPU_TYPE=i386 ++ CPU_TYPE=x86_64 + EXPORT_SYMBOLS_STYLE=darwin + ;; + diff --git a/external/firebird/firebird-cygwin-msvc.patch b/external/firebird/firebird-cygwin-msvc.patch new file mode 100644 index 000000000..317ea8026 --- /dev/null +++ b/external/firebird/firebird-cygwin-msvc.patch @@ -0,0 +1,654 @@ +--- src/include/firebird.h 2016-07-15 11:31:27.151443500 +0200 ++++ src/include/firebird.h 2016-07-17 14:50:04.043792400 +0200 +@@ -32,11 +32,7 @@ + #ifndef INCLUDE_Firebird_H + #define INCLUDE_Firebird_H + +-#ifdef _MSC_VER +-#include "gen/autoconfig_msvc.h" +-#else + #include "gen/autoconfig.h" +-#endif + + #if defined __clang__ + //#if __has_feature(address_sanitizer) +--- src/misc/writeBuildNum.sh 2016-07-07 15:57:04.538983200 +0200 ++++ src/misc/writeBuildNum.sh 2016-07-13 11:31:18.132820200 +0200 +@@ -95,9 +95,9 @@ + createMakeVersion() { + + OdsH="${Root}/src/jrd/ods.h" +-Mini="/tmp/miniods.h" +-TestCpp="/tmp/test.cpp" +-AOut="/tmp/a.out" ++Mini=$(cygpath -m "/tmp/miniods.h") ++TestCpp=$(cygpath -m "/tmp/test.cpp") ++AOut=$(cygpath -m "/tmp/a.out") + + grep ODS_VERSION $OdsH | grep -v ENCODE_ODS >$Mini + +--- builds/make.new/config/config.h.in 2016-07-07 15:55:55.693112800 +0200 ++++ builds/make.new/config/config.h.in 2016-07-08 13:38:49.994986400 +0200 +@@ -396,7 +396,7 @@ + #undef HAVE_SIGSET + + /* Define to 1 if you have the `snprintf' function. */ +-#undef HAVE_SNPRINTF ++#define HAVE_SNPRINTF + + /* Define to 1 if you have the <socket.h> header file. */ + #undef HAVE_SOCKET_H +@@ -551,7 +551,7 @@ + #undef HAVE_VFORK_H + + /* Define to 1 if you have the `vsnprintf' function. */ +-#undef HAVE_VSNPRINTF ++#define HAVE_VSNPRINTF + + /* Define to 1 if you have the <winsock2.h> header file. */ + #undef HAVE_WINSOCK2_H +@@ -646,7 +646,7 @@ + #undef TIME_WITH_SYS_TIME + + /* Define this if OS is Windows NT */ +-#undef WIN_NT ++#define WIN_NT + + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +@@ -703,3 +703,34 @@ + #ifndef HAVE_SOCKLEN_T + typedef int socklen_t; + #endif ++ ++/* taken from src/include/gen/autoconfig_msvc.h */ ++#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers ++/* target architecture */ ++#if defined(_M_IX86) ++/* sizeof(void *) */ ++#define SIZEOF_VOID_P 4 ++/* sizeof(size_t) */ ++#define SIZEOF_SIZE_T 4 ++/* alignment of long */ ++#define FB_ALIGNMENT 4 ++#elif defined(_M_AMD64) ++#define AMD64 ++/* sizeof(void *) */ ++#define SIZEOF_VOID_P 8 ++/* sizeof(size_t) */ ++#define SIZEOF_SIZE_T 8 ++/* alignment of long */ ++#define FB_ALIGNMENT 8 ++#else ++#error unknown target platform ++#endif ++ ++#define HAVE_IO_H ++ ++#define HAVE_GETPAGESIZE ++ ++#if defined _MSC_VER ++#define isnan _isnan ++#endif ++ +--- src/common/common.h 2016-07-15 11:31:26.366735500 +0200 ++++ src/common/common.h 2016-07-17 16:18:39.121579400 +0200 +@@ -551,15 +551,6 @@ + #endif /* WIN_NT */ + + +-#ifndef FB_CPU +-#error Define FB_CPU for your platform +-#endif +-#ifndef FB_OS +-#error Define FB_OS for your platform +-#endif +-#ifndef FB_CC +-#error Define FB_CC for your platform +-#endif + + + /***************************************************** +diff -ur builds/posix/make.defaults builds/posix/make.defaults +--- builds/posix/make.defaults 2016-07-07 13:56:13.036235166 +0200 ++++ builds/posix/make.defaults 2016-07-07 14:29:52.368289242 +0200 +@@ -55,7 +55,11 @@ + else + FIREBIRD=$(FB_BUILD) + endif +-FIREBIRD_LOCK=$(FIREBIRD) ++ifeq (@PLATFORM@,win32) ++ FIREBIRD_LOCK=$(shell cygpath -w $(FIREBIRD) ) ++else ++ FIREBIRD_LOCK=$(FIREBIRD) ++endif + + export FIREBIRD + export FIREBIRD_LOCK +@@ -152,7 +156,11 @@ + CD= cd + CAT= cat + AR= ar @AR_OPTIONS@ +-LN= @LN_S@ ++ifeq (@PLATFORM@,win32) ++ LN= cp ++else ++ LN= @LN_S@ ++endif + RANLIB= @RANLIB@ + BTYACC=$(ROOT)/extern/btyacc/btyacc + CLOOP=$(GEN_ROOT)/$(TARGET)/cloop/release/bin/cloop +@@ -174,10 +182,10 @@ + + # Default extensions + +-ARCH_EXT= .a ++ARCH_EXT= .lib + EXEC_EXT= @EXEEXT@ + SHRLIB_EXT=@SHRLIB_EXT@ +-LIB_PREFIX= lib ++LIB_PREFIX= + SHRLIB_FOREIGN_EXT= $(SHRLIB_EXT) + + #_____________________________________________________________________________ +@@ -203,6 +211,7 @@ + vpath %.so $(LIB) + vpath %.a $(LIB) + vpath %.dll $(LIB) ++vpath %.lib $(LIB) + + #_____________________________________________________________________________ + +@@ -216,9 +225,9 @@ + # + + #LibraryFileName=libfbclient +-LibraryFileName=libfbclient +-LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion} +-LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.2 ++LibraryFileName=ifbclient ++LibraryFullName=$(LibraryFileName).${SHRLIB_EXT} ++LibrarySoName=$(LibraryFileName).${SHRLIB_EXT} + LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT} + + LIBFIREBIRD_FULLNAME = $(LIB)/$(LibraryFullName) +@@ -227,7 +236,7 @@ + + # The firebird engine library name + +-EngineFileName=libEngine${OdsVersion} ++EngineFileName=Engine12 + EngineSoName=$(EngineFileName).${SHRLIB_EXT} + ENGINE_SONAME = $(PLUGINS)/$(EngineSoName) + +@@ -241,7 +250,7 @@ + ifeq ($(STD_EDITLINE), true) + LIBEDITLINE := -l$(READLINE) + else +- LIBEDITLINE := $(LIB)/libedit.a ++ LIBEDITLINE := $(LIB)/edit.lib + endif + endif + +@@ -289,7 +298,7 @@ + LIB_PATH_OPTS = $(call LIB_LINK_RPATH,lib) $(call LIB_LINK_RPATH,intl) + LIB_LINK_SONAME= -Wl,-soname,$(1) + LIB_LINK_MAPFILE= -Wl,--version-script,$(1) +-FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient $(MATHLIB) ++FIREBIRD_LIBRARY_LINK= -L$(LIB) -lifbclient $(MATHLIB) + + EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(LINK_EMPTY_SYMBOLS) + LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared +@@ -329,7 +338,8 @@ + + # Pay attention - we place common library into obj, not lib dir + # It's just a set of object files, prepared to be used by ld, not an output library +-COMMON_LIB = $(OBJ)/common.a ++ ++COMMON_LIB = $(OBJ)/common.lib + + # From utilities + CREATE_DB = $(RBIN)/create_db$(EXEC_EXT) +--- builds/posix/Makefile.in 2016-07-07 15:56:06.459221300 +0200 ++++ builds/posix/Makefile.in 2016-07-13 12:44:57.134217200 +0200 +@@ -33,7 +33,8 @@ + # Alex Peshkoff - created single makefile based on Mark's files + # + +-ROOT=$(shell cd ..; pwd) ++#ROOT=$(shell cd ..; pwd) ++ROOT=$(shell cygpath -m '$(shell cd ..; pwd)') + + include make.defaults + ifeq ($(CROSS_OUT), Y) +@@ -163,7 +164,7 @@ + .PHONY: cross1 cross2 boot yvalve engine fbintl gpre utilities plugins rest codes ids examples cross_rest + + master_process: +- ln -sf $(SRC_ROOT)/include/gen/autoconfig.auto $(SRC_ROOT)/include/gen/autoconfig.h ++ cp -f $(SRC_ROOT)/include/gen/autoconfig.auto $(SRC_ROOT)/include/gen/autoconfig.h + $(MAKE) updateBuildNum + $(MAKE) export_lists + $(MAKE) extern +@@ -186,10 +187,10 @@ + (cd $(BIN); $(LN) $(notdir $(GPRE)) $(notdir $(GPRE_CURRENT))) + ifeq ($(IsDeveloper), Y) + # In developer mode we must regenerate various files in include/gen +- $(MAKE) codes ++# $(MAKE) codes + endif +- $(MAKE) plugins +- $(MAKE) examples ++# $(MAKE) plugins ++ $(MAKE) include_generic + $(MAKE) rest + + +@@ -198,7 +199,7 @@ + $(MAKE) CROSS_OUT=Y cross2 + + cross1: +- ln -sf $(SRC_ROOT)/include/gen/autoconfig.auto $(SRC_ROOT)/include/gen/autoconfig.h ++ cp -f $(SRC_ROOT)/include/gen/autoconfig.auto $(SRC_ROOT)/include/gen/autoconfig.h + $(MAKE) updateBuildNum + $(MAKE) export_lists + $(MAKE) extern +@@ -223,7 +224,7 @@ + $(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/ + + cross2: +- ln -sf $(SRC_ROOT)/include/cross/$(CROSS_CONFIG) $(SRC_ROOT)/include/gen/autoconfig.h ++ cp -f $(SRC_ROOT)/include/cross/$(CROSS_CONFIG) $(SRC_ROOT)/include/gen/autoconfig.h + $(MAKE) prerequisites + $(MAKE) tommath + $(MAKE) yvalve +@@ -275,7 +275,8 @@ + + # remote redirector is statically linked in main FB library + $(LIBFIREBIRD_FULLNAME): $(YValve_Objects) $(Remote_Client_Objects) $(COMMON_LIB) +- $(LINK_FIREBIRD) -o $@ $^ $(LINK_FIREBIRD_LIBS) ++ @echo 'compile: $(LINK_FIREBIRD) $(CPPFLAGS) -o $@ $^ $(LINK_FIREBIRD_LIBS)' ++ $(LINK_FIREBIRD) $(CPPFLAGS) -o $@ $^ $(LINK_FIREBIRD_LIBS) + + + #___________________________________________________________________________ +@@ -284,7 +286,8 @@ + engine: $(ENGINE_SONAME) + + $(ENGINE_SONAME): $(Engine_Objects) $(SVC_Objects) $(COMMON_LIB) +- $(LINK_ENGINE) -o $@ $^ $(LINK_ENGINE_LIBS) ++ @echo 'compile engine: $(LINK_ENGINE) $(CPPFLAGS) -o $@ $^ $(LINK_ENGINE_LIBS)' ++ $(LINK_ENGINE) $(CPPFLAGS) -o $@ $^ $(YValve_Objects) $(Remote_Client_Objects) $(LINK_ENGINE_LIBS) + + + #___________________________________________________________________________ +@@ -294,7 +297,7 @@ + fbintl: $(LIBFBINTL_SO) + + $(LIBFBINTL_SO): $(INTL_Objects) $(COMMON_LIB) +- $(LINK_INTL) -o $@ $^ $(LINK_INTL_LIBS) ++ $(LINK_INTL) $(CPPFLAGS) -o $@ $^ $(YValve_Objects) $(Remote_Client_Objects) $(LINK_INTL_LIBS) + + + #___________________________________________________________________________ +@@ -393,7 +396,7 @@ + + .PHONY: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup + +-utilities: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup udfsupport ++utilities: gbak gfix isql + + firebird_server: $(FB_DAEMON) + +@@ -540,7 +543,7 @@ + GBAK_FILES := $(FDB_FILES:.fdb=.gbak) $(FIREBIRD)/msg.gbak + GBAK_FILES := $(subst Native,$(TARGET),$(GBAK_FILES)) + +-rest: qli message_file ++rest: message_file + + cross_rest: qli gbak_files + $(MAKE) $(BUILD_FILE) +@@ -593,7 +595,7 @@ + IBASE_ExtraFiles = include/types_pub.h include/consts_pub.h dsql/sqlda_pub.h common/dsc_pub.h jrd/ibase.h jrd/inf_pub.h jrd/blr.h include/gen/iberror.h + SRC_IBASE_ExtraFiles = $(addprefix $(SRC_ROOT)/, $(IBASE_ExtraFiles)) + MAKE_HEADER_Src = $(addprefix $(SRC_ROOT)/, misc/makeHeader.cpp) +-MAKE_HEADER_Bin = ./makeHeader ++MAKE_HEADER_Bin = ./makeHeader.exe + + $(INCLUDE_DEST)/ibase.h: $(SRC_IBASE_ExtraFiles) + $(STATICEXE_LINK) -o $(MAKE_HEADER_Bin) $(MAKE_HEADER_Src) +diff -ur builds/posix/Makefile.in.examples builds/posix/Makefile.in.examples +--- builds/posix/Makefile.in.examples 2016-07-07 13:56:13.048235166 +0200 ++++ builds/posix/Makefile.in.examples 2016-07-07 14:37:36.904301682 +0200 +@@ -65,10 +65,13 @@ + EXAMPLES_DEST= $(GEN_ROOT)/examples + EXAMPLES_SRC= $(ROOT)/examples + +- ++ifeq ($(PLATFORM),win32) ++EMPBLD_Objects= $(EXAMPLES_DEST)/empbuild.obj ++INTLBLD_Objects= $(EXAMPLES_DEST)/intlbld.obj ++else + EMPBLD_Objects= $(EXAMPLES_DEST)/empbuild.o +- + INTLBLD_Objects= $(EXAMPLES_DEST)/intlbld.o ++endif + + INPUT_Files = empddl.sql empdml.sql indexoff.sql indexon.sql \ + job.inp lang.inp proj.inp qtr.inp +@@ -172,3 +175,5 @@ + + $(EXAMPLES_DEST)/%.h: $(EXAMPLES_SRC)/common/%.h + $(CP) $^ $@ ++$(EXAMPLES_DEST)/%.obj: $(EXAMPLES_DEST)/%.c ++ $(CC) -c $(firstword $<) -Fo$@ $(WCFLAGS) +diff -ur builds/posix/make.rules builds/posix/make.rules +--- builds/posix/make.rules 2016-07-07 13:56:13.036235166 +0200 ++++ builds/posix/make.rules 2016-07-07 14:31:16.116291485 +0200 +@@ -88,22 +88,20 @@ + + $(OBJ)/%.o: $(SRC_ROOT)/%.c + $(CC) $(WCFLAGS) -c $(firstword $<) -o $@ +- @sed $(INLINE_EDIT_SED) -e "1,2s/:/: \$$(wildcard/" -e "\$$s/\(.*\)/\\1)/" $(patsubst %.o,%.d,$@) + + $(OBJ)/%.o: $(OBJ)/%.cpp + $(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@ +- @sed $(INLINE_EDIT_SED) -e "1,2s/:/: \$$(wildcard/" -e "\$$s/\(.*\)/\\1)/" $(patsubst %.o,%.d,$@) + + $(OBJ)/%.o: $(SRC_ROOT)/%.cpp + $(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@ +- @sed $(INLINE_EDIT_SED) -e "1,2s/:/: \$$(wildcard/" -e "\$$s/\(.*\)/\\1)/" $(patsubst %.o,%.d,$@) + + .SUFFIXES: .epp .e + + # Rules for making resource files + + $(GEN_ROOT)/%.res: $(SRC_ROOT)/%.rc +- windres --output-format=coff --include-dir=$(<D) $< $@ ++ mkdir -p $(@D) ++ rc.exe $(SOLARINC) /fo $@ $< + + # Rule for making gbak files when cross-compiling + +--- src/common/utils.cpp 2016-07-15 11:31:26.746871100 +0200 ++++ src/common/utils.cpp 2016-07-19 19:14:45.370689300 +0200 +@@ -880,15 +880,15 @@ + FILETIME utime, stime, dummy; + if (GetProcessTimes(GetCurrentProcess(), &dummy, &dummy, &stime, &utime)) + { +- LARGE_INTEGER lint; ++ LARGE_INTEGER myLargeInt; + +- lint.HighPart = stime.dwHighDateTime; +- lint.LowPart = stime.dwLowDateTime; +- sysTime = lint.QuadPart / 10000; +- +- lint.HighPart = utime.dwHighDateTime; +- lint.LowPart = utime.dwLowDateTime; +- userTime = lint.QuadPart / 10000; ++ myLargeInt.HighPart = stime.dwHighDateTime; ++ myLargeInt.LowPart = stime.dwLowDateTime; ++ sysTime = myLargeInt.QuadPart / 10000; ++ ++ myLargeInt.HighPart = utime.dwHighDateTime; ++ myLargeInt.LowPart = utime.dwLowDateTime; ++ userTime = myLargeInt.QuadPart / 10000; + } + else + { +diff -ur builds/posix/prefix.mingw builds/posix/prefix.mingw +--- builds/posix/prefix.mingw 2016-07-07 13:56:13.048235166 +0200 ++++ builds/posix/prefix.mingw 2016-07-07 14:50:54.704323046 +0200 +@@ -20,8 +20,8 @@ + # + + # -Wno-unused-variable is used due to unused gpre generated variables +-PROD_FLAGS=-O2 -DMINGW -Wall -Wshadow -Wundef -Wno-long-long -Wno-unused-variable -Wno-sign-compare -Wno-parentheses -Wno-switch -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads -Wno-non-virtual-dtor +-DEV_FLAGS=-ggdb -DMINGW -Wall -Wshadow -Wundef -Wno-long-long -Wno-unused-variable -Wno-sign-compare -Wno-parentheses -Wno-switch -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads -Wno-non-virtual-dtor ++PROD_FLAGS=-O2 -DMINGW -Dlint -DWIN32_LEAN_AND_MEAN ++DEV_FLAGS=-ggdb -DMINGW -Dlint -DWIN32_LEAN_AND_MEAN + + PLATFORM_PATH=os/win32 + +@@ -29,6 +29,7 @@ + LIB_LINK=$(LD) + + LIB_LINK_OPTIONS+=-Wl,--enable-stdcall-fixup ++LIB_PLATFORM_RPATH= + + # Strip symbols from release versions to decrease size + ifeq ($(IsProdTypeBuild),Y) +@@ -36,6 +37,9 @@ + LIB_LINK_OPTIONS+=-Wl,-s + endif + ++LIB_LINK_OPTIONS= ++LINK_OPTS= ++ + # Generation of fbclient_ms.lib + LIB_LINK_IMPLIB:=-Wl,--out-implib,firebird/lib/fbclient_ms.lib + LIB_GUI:= -mwindows -lcomctl32 -lgdi32 +@@ -55,7 +59,8 @@ + ClientLibrarySoName := $(ClientLibraryName) + + # Looks like MinGW 3 does not support version scripts but support def-files +-LINK_FIREBIRD_SYMBOLS = $(BLD_ROOT)/win32/defs/fbclient_s.def $(BLD_ROOT)/win32/defs/fbclient.def ++LINK_FIREBIRD_SYMBOLS = /def:$(BLD_ROOT)/win32/defs/fbclient_s.def /def:$(BLD_ROOT)/win32/defs/firebird.def ++LINK_PLUGIN_SYMBOLS = /def:$(BLD_ROOT)/win32/defs/plugin.def + + # This is required for newly built executable to find newly built shared + # libraries because on Win32 there is no such thing as LD_LIBRARY_PATH +--- builds/posix/make.shared.variables 2016-07-22 17:07:46.650672300 +0200 ++++ builds/posix/make.shared.variables 2016-07-23 10:44:41.311454600 +0200 +@@ -56,6 +56,7 @@ + Remote_Server:= $(call dirObjects,remote/server) $(call dirObjects,auth/SecureRemotePassword/server) + Remote_Client:= $(call dirObjects,remote/client) $(call dirObjects,auth/SecureRemotePassword/client) \ + $(call makeObjects,auth/SecurityDatabase,LegacyClient.cpp) \ ++ $(call dirObjects,auth/trusted) \ + $(call dirObjects,plugins/crypt/arc4) + Remote_Server_Objects:= $(Remote_Common) $(Remote_Server) + Remote_Client_Objects:= $(Remote_Common) $(Remote_Client) +diff -ur configure configure +--- configure 2016-07-07 13:55:54.976234682 +0200 ++++ configure 2016-07-07 14:54:30.012328812 +0200 +@@ -3337,6 +3337,14 @@ + SHRLIB_EXT=dll + ;; + ++ *-*-cygwin*) ++ MAKEFILE_PREFIX=mingw ++ PLATFORM=win32 ++ EDITLINE_FLG=N ++ RAW_DEVICES_FLG=N ++ SHRLIB_EXT=dll ++ ;; ++ + *) + as_fn_error $? "unsupported platform ${build}" "$LINENO" 5 + ;; +@@ -8432,6 +8432,9 @@ + mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; ++cygwin*) ++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; + esac + + # Try without a prefix underscore, then with it. +diff -ur extern/btyacc/main.c extern/btyacc/main.c +--- extern/btyacc/main.c 2016-07-07 13:55:55.448234695 +0200 ++++ extern/btyacc/main.c 2016-07-07 14:56:03.560331317 +0200 +@@ -2,7 +2,7 @@ + #include <signal.h> + #include <stdio.h> + +-#if defined(WIN32) ++#if defined(WIN32) || defined(_WIN32) + #include <io.h> + #else + #include <unistd.h> +diff -ur extern/btyacc/Makefile extern/btyacc/Makefile +--- extern/btyacc/Makefile 2016-07-07 13:55:55.448234695 +0200 ++++ extern/btyacc/Makefile 2016-07-07 14:57:42.284333961 +0200 +@@ -42,7 +42,10 @@ + all: $(PROGRAM) + + $(PROGRAM): $(OBJS) $(LIBS) +- $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) ++ $(CC) -o $(PROGRAM).exe $(OBJS) $(LIBS) $(LDFLAGS) ++ ++%.o: %.c ++ $(CC) -c $< -Fo$@ $(CCFLAGS) + + clean:; rm -f $(OBJS) + +--- extern/cloop/src/tests/test1/CppTest.cpp 2016-07-07 15:56:27.948015300 +0200 ++++ extern/cloop/src/tests/test1/CppTest.cpp 2016-07-13 18:58:48.529822600 +0200 +@@ -24,6 +24,7 @@ + #include <stdio.h> + #include <assert.h> + ++#define WIN32 + #ifdef WIN32 + #include <windows.h> + #define DLL_EXPORT __declspec(dllexport) +--- extern/cloop/src/tests/test1/CTest.c 2016-07-07 15:56:27.611791300 +0200 ++++ extern/cloop/src/tests/test1/CTest.c 2016-07-13 17:04:22.805090300 +0200 +@@ -23,6 +23,7 @@ + #include <malloc.h> + #include <stdio.h> + ++#define WIN32 + #ifdef WIN32 + #include <windows.h> + #define DLL_EXPORT __declspec(dllexport) +--- extern/cloop/Makefile 2016-07-07 15:56:28.279136300 +0200 ++++ extern/cloop/Makefile 2016-07-13 16:22:38.493479800 +0200 +@@ -11,8 +11,8 @@ + SRC_DIR := src + BUILD_DIR := build + OUT_DIR := output +-SHRLIB_EXT := .so +-EXE_EXT := ++SHRLIB_EXT := .dll ++EXE_EXT := .exe + + OBJ_DIR := $(BUILD_DIR)/$(TARGET) + BIN_DIR := $(OUT_DIR)/$(TARGET)/bin +@@ -27,7 +27,7 @@ + OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C)) + OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP)) + +-C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter ++C_FLAGS := -fPIC + CXX_FLAGS := $(C_FLAGS) + FPC_FLAGS := -Mdelphi + +@@ -53,7 +53,7 @@ + .PHONY: all mkdirs clean + + all: mkdirs \ +- $(BIN_DIR)/cloop \ ++ $(BIN_DIR)/cloop$(EXE_EXT) \ + $(BIN_DIR)/test1-c$(SHRLIB_EXT) \ + $(BIN_DIR)/test1-c$(EXE_EXT) \ + $(BIN_DIR)/test1-cpp$(SHRLIB_EXT) \ +@@ -74,7 +74,7 @@ + -include $(addsuffix .d,$(basename $(OBJS_C))) + -include $(addsuffix .d,$(basename $(OBJS_CPP))) + +-$(BIN_DIR)/cloop: \ ++$(BIN_DIR)/cloop$(EXE_EXT): \ + $(OBJ_DIR)/cloop/Expr.o \ + $(OBJ_DIR)/cloop/Generator.o \ + $(OBJ_DIR)/cloop/Lexer.o \ +@@ -83,20 +83,20 @@ + + $(LD) $^ -o $@ + +-$(SRC_DIR)/tests/test1/CalcCApi.h: $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl +- $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl c-header $@ CALC_C_API_H CALC_I ++$(SRC_DIR)/tests/test1/CalcCApi.h: $(BIN_DIR)/cloop$(EXE_EXT) $(SRC_DIR)/tests/test1/Interface.idl ++ $(BIN_DIR)/cloop$(EXE_EXT) $(SRC_DIR)/tests/test1/Interface.idl c-header $@ CALC_C_API_H CALC_I + +-$(SRC_DIR)/tests/test1/CalcCApi.c: $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl $(SRC_DIR)/tests/test1/CalcCApi.h +- $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl c-impl $@ CalcCApi.h CALC_I ++$(SRC_DIR)/tests/test1/CalcCApi.c: $(BIN_DIR)/cloop$(EXE_EXT) $(SRC_DIR)/tests/test1/Interface.idl $(SRC_DIR)/tests/test1/CalcCApi.h ++ $(BIN_DIR)/cloop$(EXE_EXT) $(SRC_DIR)/tests/test1/Interface.idl c-impl $@ CalcCApi.h CALC_I + +-$(SRC_DIR)/tests/test1/CalcCppApi.h: $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl +- $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl c++ $@ CALC_CPP_API_H calc I ++$(SRC_DIR)/tests/test1/CalcCppApi.h: $(BIN_DIR)/cloop$(EXE_EXT) $(SRC_DIR)/tests/test1/Interface.idl ++ $(BIN_DIR)/cloop$(EXE_EXT) $(SRC_DIR)/tests/test1/Interface.idl c++ $@ CALC_CPP_API_H calc I + +-$(SRC_DIR)/tests/test1/CalcPascalApi.pas: $(BIN_DIR)/cloop \ ++$(SRC_DIR)/tests/test1/CalcPascalApi.pas: $(BIN_DIR)/cloop$(EXE_EXT) \ + $(SRC_DIR)/tests/test1/Interface.idl \ + $(SRC_DIR)/tests/test1/CalcPascalApi.interface.pas \ + $(SRC_DIR)/tests/test1/CalcPascalApi.implementation.pas +- $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl pascal $@ CalcPascalApi \ ++ $(BIN_DIR)/cloop$(EXE_EXT) $(SRC_DIR)/tests/test1/Interface.idl pascal $@ CalcPascalApi \ + --uses "SysUtils" \ + --interfaceFile $(SRC_DIR)/tests/test1/CalcPascalApi.interface.pas \ + --implementationFile $(SRC_DIR)/tests/test1/CalcPascalApi.implementation.pas \ +@@ -108,23 +108,23 @@ + $(OBJ_DIR)/tests/test1/CalcCApi.o \ + $(OBJ_DIR)/tests/test1/CTest.o \ + +- $(LD) $^ -shared -ldl -o $@ ++ $(LD) $^ -o $@ + + $(BIN_DIR)/test1-c$(EXE_EXT): \ + $(OBJ_DIR)/tests/test1/CalcCApi.o \ + $(OBJ_DIR)/tests/test1/CTest.o \ + +- $(LD) $^ -ldl -o $@ ++ $(LD) $^ -o $@ + + $(BIN_DIR)/test1-cpp$(SHRLIB_EXT): \ + $(OBJ_DIR)/tests/test1/CppTest.o \ + +- $(LD) $^ -shared -ldl -o $@ ++ $(LD) $^ -o $@ + + $(BIN_DIR)/test1-cpp$(EXE_EXT): \ + $(OBJ_DIR)/tests/test1/CppTest.o \ + +- $(LD) $^ -ldl -o $@ ++ $(LD) $^ -o $@ + + $(BIN_DIR)/test1-pascal$(SHRLIB_EXT): \ + $(SRC_DIR)/tests/test1/PascalClasses.pas \ +diff -ur src/common/classes/fb_string.cpp src/common/classes/fb_string.cpp +--- src/common/classes/fb_string.cpp 2016-07-07 13:55:56.064234711 +0200 ++++ src/common/classes/fb_string.cpp 2016-07-07 14:59:01.516336083 +0200 +@@ -32,6 +32,12 @@ + #include <ctype.h> + #include <stdarg.h> + ++#ifdef WIN_NT ++#pragma comment(lib, "User32.lib") ++#pragma comment(lib, "advapi32") ++#pragma comment(lib, "shell32.lib") ++#endif ++ + #ifdef HAVE_STRCASECMP + #define STRNCASECMP strncasecmp + #else +diff -ur src/misc/makeHeader.cpp src/misc/makeHeader.cpp +--- src/misc/makeHeader.cpp 2016-07-07 13:56:00.100234819 +0200 ++++ src/misc/makeHeader.cpp 2016-07-07 15:00:14.780338045 +0200 +@@ -1,9 +1,9 @@ + #include <stdio.h> + #include <string.h> + #include <errno.h> +-//#ifdef HAVE_UNISTD_H ++#ifdef HAVE_UNISTD_H + #include <unistd.h> +-//#endif ++#endif + + + diff --git a/external/firebird/firebird-gcc6.patch.1 b/external/firebird/firebird-gcc6.patch.1 new file mode 100644 index 000000000..e1361415c --- /dev/null +++ b/external/firebird/firebird-gcc6.patch.1 @@ -0,0 +1,19 @@ +commit 3618aa2171674babf79ef935aa049c40a3db1321 +Author: asfernandes <asfernandes@users.sourceforge.net> +Date: Sat Mar 5 03:39:36 2016 +0000 + + Make the generated code compatible with gcc 6 in C++-14 mode. + +diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp +index 2af96c6..2dcffd6 100644 +--- a/src/gpre/c_cxx.cpp ++++ b/src/gpre/c_cxx.cpp +@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request) + printa(0, "static %sshort\n isc_%dl = %d;", + (request->req_flags & REQ_extend_dpb) ? "" : CONST_STR, + request->req_ident, request->req_length); +- printa(0, "static %schar\n isc_%d [] = {", CONST_STR, request->req_ident); ++ printa(0, "static %sunsigned char\n isc_%d [] = {", CONST_STR, request->req_ident); + + const TEXT* string_type = "blr"; + if (gpreGlob.sw_raw) diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1 new file mode 100644 index 000000000..e379ca738 --- /dev/null +++ b/external/firebird/firebird-macosx.patch.1 @@ -0,0 +1,132 @@ +--- firebird.org/extern/cloop/src/tests/test1/CTest.c 2016-08-01 22:55:35.000000000 +0200 ++++ firebird/extern/cloop/src/tests/test1/CTest.c 2016-08-02 21:11:31.000000000 +0200 +@@ -20,7 +20,7 @@ + */ + + #include "CalcCApi.h" +-#include <malloc.h> ++#include <stdlib.h> + #include <stdio.h> + + #ifdef WIN32 +--- firebird.org/builds/posix/prefix.darwin_x86_64 2016-08-01 20:02:48.000000000 +0200 ++++ firebird/builds/posix/prefix.darwin_x86_64 2016-08-01 21:42:45.000000000 +0200 +@@ -19,8 +19,6 @@ + # + # Default build from 10.7 using Clang + +-DYLD_LIBRARY_PATH=$(HOME)/icu54/icu/source/lib +-export DYLD_LIBRARY_PATH + + #DYLD_PRINT_ENV=1 + #export DYLD_PRINT_ENV +@@ -31,15 +31,15 @@ + MACOSX_DEPLOYMENT_TARGET=10.7 + export MACOSX_DEPLOYMENT_TARGET + +-PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -mmacosx-version-min=10.7 +-DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=10.7 -Wno-non-virtual-dtor ++PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common ++DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -Wno-non-virtual-dtor + CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden + + EXE_LINK_OPTIONS:= + UNDEF_PLATFORM= + + LINK_LIBS+=-liconv +-MATHLIB=/opt/local/lib/libtommath.a ++MATHLIB=-ltommath + SO_LINK_LIBS+=-liconv + + include $(ROOT)/gen/darwin.defaults +--- firebird.org/builds/posix/postfix.darwin 2016-08-01 20:02:48.000000000 +0200 ++++ firebird/builds/posix/postfix.darwin 2016-08-01 22:17:49.000000000 +0200 +@@ -54,9 +54,9 @@ + cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers + cp ../gen/firebird/lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird + cp ../gen/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Libraries/libfbclient.dylib +- cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib +- cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib +- cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib ++# cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib ++# cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib ++# cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib + cp ../gen/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib + cp ../gen/firebird/firebird.msg \ + $(FB_FW)/Resources/English.lproj/var/firebird.msg +@@ -68,8 +68,8 @@ + $(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf + chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl + mkdir -p $(FB_FW)/Resources/English.lproj/var/plugins +- cp ../gen/firebird/plugins/libfbtrace.dylib \ +- $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib ++# cp ../gen/firebird/plugins/libfbtrace.dylib \ ++# $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib + cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help + cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var + mkdir -p $(FB_FW)/Resources/doc +--- firebird.org/builds/posix/Makefile.in 2016-08-08 17:58:20.000000000 +0200 ++++ firebird/builds/posix/Makefile.in 2016-08-08 17:57:17.000000000 +0200 +@@ -191,6 +191,9 @@ + $(MAKE) plugins + $(MAKE) examples + $(MAKE) rest ++ install_name_tool -id @__________________________________________________OOO/libfbclient.dylib.3.0.0 $(LIB)/libfbclient.dylib ++ install_name_tool -id @__________________________________________________OOO/libEngine12.dylib $(PLUGINS)/libEngine12.dylib ++ install_name_tool -change $(LIB)/libfbclient.dylib.3.0.0 @loader_path/libfbclient.dylib.3.0.0 $(PLUGINS)/libEngine12.dylib + + + cross_process: +--- firebird.org/src/common/unicode_util.cpp 2016-07-07 13:55:55.992234709 +0200 ++++ firebird/src/common/unicode_util.cpp 2016-08-10 11:25:46.422331020 +0200 +@@ -63,8 +63,8 @@ + #elif defined(DARWIN) + //const char* const inTemplate = "/Library/Frameworks/Firebird.framework/Versions/A/Libraries/libicui18n.dylib"; + //const char* const ucTemplate = "/Library/Frameworks/Firebird.framework/versions/A/Libraries/libicuuc.dylib"; +-const char* const inTemplate = "libicui18n.dylib"; +-const char* const ucTemplate = "libicuuc.dylib"; ++const char* const inTemplate = "libicui18n.dylib.%s"; ++const char* const ucTemplate = "libicuuc.dylib.%s"; + #elif defined(HPUX) + const char* const inTemplate = "libicui18n.sl.%s"; + const char* const ucTemplate = "libicuuc.sl.%s"; +@@ -353,6 +353,16 @@ + s.printf("%d%d", majorVersion, minorVersion); + + filename.printf(templateName, s.c_str()); ++ const char * envpath = getenv("LIBREOFFICE_FIREBIRD_LIB"); ++ if(envpath == nullptr) ++ { ++ envpath = getenv("LIBREOFFICE_ICU_LIB"); ++ } ++ if(envpath != nullptr) ++ { ++ s = filename.c_str(); ++ PathUtils::concatPath(filename, envpath, s.c_str()); ++ } + } + + +--- firebird.org/src/common/utils.cpp 2016-08-16 10:11:10.000000000 +0200 ++++ firebird/src/common/utils.cpp 2016-08-16 11:27:09.000000000 +0200 +@@ -1027,10 +1027,18 @@ + return s; + } + +- // Set relative path to Engine12 dynamic library ++ // Set path to Engine12 dynamic library. + if(prefType == Firebird::IConfigManager::DIR_PLUGINS) + { +- s = name; ++ const char * const envpath = getenv("LIBREOFFICE_FIREBIRD_LIB"); ++ if(envpath != nullptr) ++ { ++ PathUtils::concatPath(s, envpath, name); ++ } ++ else ++ { ++ s = name; ++ } + return s; + } + } diff --git a/external/firebird/firebird-rpath.patch.0 b/external/firebird/firebird-rpath.patch.0 new file mode 100644 index 000000000..a730e72a8 --- /dev/null +++ b/external/firebird/firebird-rpath.patch.0 @@ -0,0 +1,11 @@ +--- builds/posix/make.defaults ++++ builds/posix/make.defaults +@@ -279,7 +279,7 @@ + + ifeq (@USE_RPATH@,1) + ifeq ($(strip @BINRELOC_CFLAGS@),) +- LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),@FB_LIBDIR@,@FB_INTLDIR@)) ++ LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN') + else + LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN/../$(1)') + endif diff --git a/external/firebird/firebird-tdf125284.patch.1 b/external/firebird/firebird-tdf125284.patch.1 new file mode 100644 index 000000000..a1cb2043e --- /dev/null +++ b/external/firebird/firebird-tdf125284.patch.1 @@ -0,0 +1,27 @@ +--- firebird/src/common/config/config_file.cpp 2019-08-23 16:42:26.721439468 +0100 ++++ firebird/src/common/config/config_file.cpp 2019-08-23 16:43:07.506579222 +0100 +@@ -521,16 +521,14 @@ + unsigned code; + const char* name; + } dirs[] = { +-#define NMDIR(a) {Firebird::IConfigManager::a, "FB_"#a}, +- NMDIR(DIR_CONF) +- NMDIR(DIR_SECDB) +- NMDIR(DIR_PLUGINS) +- NMDIR(DIR_UDF) +- NMDIR(DIR_SAMPLE) +- NMDIR(DIR_SAMPLEDB) +- NMDIR(DIR_INTL) +- NMDIR(DIR_MSG) +-#undef NMDIR ++ {Firebird::IConfigManager::DIR_CONF, "FB_dir_conf"}, ++ {Firebird::IConfigManager::DIR_SECDB, "FB_dir_secdb"}, ++ {Firebird::IConfigManager::DIR_PLUGINS, "FB_dir_plugins"}, ++ {Firebird::IConfigManager::DIR_UDF, "FB_dir_udf"}, ++ {Firebird::IConfigManager::DIR_SAMPLE, "FB_dir_sample"}, ++ {Firebird::IConfigManager::DIR_SAMPLEDB, "FB_dir_sampledb"}, ++ {Firebird::IConfigManager::DIR_INTL, "FB_dir_intl"}, ++ {Firebird::IConfigManager::DIR_MSG, "FB_dir_msg"}, + {Firebird::IConfigManager::DIR_COUNT, NULL} + }; + diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1 new file mode 100644 index 000000000..609f380a3 --- /dev/null +++ b/external/firebird/firebird-vs2017.patch.1 @@ -0,0 +1,11 @@ +diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp firebird/src/common/os/win32/mod_loader.cpp +--- firebird.orig/src/common/os/win32/mod_loader.cpp 2017-02-15 22:11:48.939042400 +0100 ++++ firebird/src/common/os/win32/mod_loader.cpp 2017-02-15 22:12:30.062262700 +0100 +@@ -103,6 +103,6 @@ + "msvcr120.dll", +-#elif _MSC_VER == 1900 ++#elif _MSC_VER >= 1900 && _MSC_VER < 2000 + "vcruntime140.dll", + #else + #error Specify CRT DLL name here ! + #endif diff --git a/external/firebird/firebird.disable-ib-util-not-found.patch.1 b/external/firebird/firebird.disable-ib-util-not-found.patch.1 new file mode 100644 index 000000000..86dedd0dd --- /dev/null +++ b/external/firebird/firebird.disable-ib-util-not-found.patch.1 @@ -0,0 +1,17 @@ +--- firebird.org/src/jrd/fun.epp 2015-01-23 22:11:26.751475044 +0100 ++++ firebird/src/jrd/fun.epp 2015-01-23 22:16:42.507322568 +0100 +@@ -164,10 +164,14 @@ + if (tryLibrary(LIBNAME, message[3])) + return; + ++ /* fdo#72543: quote from https://bugs.freedesktop.org/show_bug.cgi?id=72543#c8 ++ "we don't need UDF support for embedded firebird, ++ hence the lack of ib_util isn't an issue and can safely be ignored" + // all failed - log error + gds__log("ib_util init failed, UDFs can't be used - looks like firebird misconfigured\n" + "\t%s\n\t%s\n\t%s\n\t%s", message[0].c_str(), message[1].c_str(), + message[2].c_str(), message[3].c_str()); ++ */ + } + + void* IbUtil::alloc(long size) diff --git a/external/firebird/libc++.patch b/external/firebird/libc++.patch new file mode 100644 index 000000000..270c0772a --- /dev/null +++ b/external/firebird/libc++.patch @@ -0,0 +1,11 @@ +--- src/common/classes/FpeControl.h ++++ src/common/classes/FpeControl.h +@@ -222,7 +222,7 @@ + { + return (!_finite (x) && !isnan(x)); + } +-#else ++#elif !defined _LIBCPP_VERSION || _LIBCPP_VERSION < 3900 + #ifndef isinf + template <typename F> + inline bool isinf(F x) diff --git a/external/firebird/macosx-elcapitan-dyld.patch b/external/firebird/macosx-elcapitan-dyld.patch new file mode 100644 index 000000000..134cdd974 --- /dev/null +++ b/external/firebird/macosx-elcapitan-dyld.patch @@ -0,0 +1,58 @@ +--- examples/empbuild/empbuild.e ++++ examples/empbuild/empbuild.e +@@ -64,7 +64,7 @@ + * Functional description + * + **************************************/ +-TEXT cmd [140]; ++TEXT cmd [8000]; + + if (argc > 1) + strcpy (Db_name, argv[1]); +@@ -94,7 +94,9 @@ + } + + printf ("Turning forced writes off\n"); ++char const * lp = getenv("DYLD_LIBRARY_PATH"); ++if (!lp) lp = ""; +-sprintf (cmd, "gfix -write async %s", Db_name); ++sprintf (cmd, "DYLD_LIBRARY_PATH=%s gfix -write async %s", lp, Db_name); + if (system (cmd)) + { + printf ("Couldn't turn forced writes off\n"); +@@ -104,7 +106,7 @@ + } + + printf ("Creating tables\n"); +-sprintf (cmd, "isql %s -q -i empddl.sql", Db_name); ++sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -q -i empddl.sql", lp, Db_name); + if (system (cmd)) + { + printf ("Couldn't create tables \n"); +@@ -120,7 +122,7 @@ + } + + printf ("Turning off indices and triggers \n"); +-sprintf (cmd, "isql %s -i indexoff.sql", Db_name); ++sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i indexoff.sql", lp, Db_name); + if (system (cmd)) + { + printf ("Couldn't turn off indices and triggers \n"); +@@ -128,7 +130,7 @@ + } + + printf ("Loading column data\n"); +-sprintf (cmd, "isql %s -i empdml.sql", Db_name); ++sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i empdml.sql", lp, Db_name); + if (system (cmd)) + { + printf ("Couldn't load column data \n"); +@@ -136,7 +138,7 @@ + } + + printf ("Turning on indices and triggers \n"); +-sprintf (cmd, "isql %s -i indexon.sql", Db_name); ++sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i indexon.sql", lp, Db_name); + if (system (cmd)) + { + printf ("Couldn't turn on indices and triggers \n"); diff --git a/external/firebird/sanitizer.patch b/external/firebird/sanitizer.patch new file mode 100644 index 000000000..e727d581e --- /dev/null +++ b/external/firebird/sanitizer.patch @@ -0,0 +1,80 @@ +--- builds/posix/fbintl.vers ++++ builds/posix/fbintl.vers +@@ -29,3 +29,4 @@ + LD_lookup_texttype + LD_setup_attributes + LD_version ++_ZTI* +--- builds/posix/fbplugin.vers ++++ builds/posix/fbplugin.vers +@@ -26,3 +26,4 @@ + # + + firebird_plugin ++_ZTI* +--- builds/posix/firebird.vers ++++ builds/posix/firebird.vers +@@ -367,3 +367,4 @@ + + KEYWORD_stringIsAToken + KEYWORD_getTokens ++_ZTI* +--- builds/posix/make.defaults ++++ builds/posix/make.defaults +@@ -252,7 +252,7 @@ + # LINKER OPTIONS + # + +-UNDEF_PLATFORM = -Wl,--no-undefined ++UNDEF_PLATFORM = + ifeq ($(TARGET),Debug) + UNDEF_FLAGS = $(UNDEF_PLATFORM) + endif +@@ -291,7 +291,7 @@ + LIB_LINK_MAPFILE= -Wl,--version-script,$(1) + FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient $(MATHLIB) + +-EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(LINK_EMPTY_SYMBOLS) ++EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) + LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared + + FB_DAEMON = $(BIN)/firebird$(EXEC_EXT) +--- src/common/classes/alloc.cpp ++++ src/common/classes/alloc.cpp +@@ -2535,7 +2535,7 @@ + const char* myStack = &probeVar; + const char* thisLocation = (const char*) this; + ptrdiff_t distance = thisLocation - myStack; +- fb_assert(absVal(distance) < 128 * 1024); ++ //fb_assert(absVal(distance) < 128 * 1024); + } + #endif + +--- src/common/os/posix/mod_loader.cpp ++++ src/common/os/posix/mod_loader.cpp +@@ -88,7 +88,7 @@ + + ModuleLoader::Module* ModuleLoader::loadModule(const Firebird::PathName& modPath) + { +- void* module = dlopen(modPath.nullStr(), FB_RTLD_MODE); ++ void* module = dlopen(modPath.nullStr(), FB_RTLD_MODE | RTLD_GLOBAL); + if (module == NULL) + { + #ifdef DEV_BUILD +--- src/jrd/met.epp ++++ src/jrd/met.epp +@@ -1486,10 +1486,11 @@ + USHORT offset = p[0] | (p[1] << 8); + p += 2; + +- const Ods::Descriptor* odsDflDesc = (Ods::Descriptor*) p; +- p = (UCHAR*) (odsDflDesc + 1); ++ Ods::Descriptor odsDflDesc; ++ memcpy(&odsDflDesc, p, sizeof (Ods::Descriptor)); ++ p = (UCHAR*) (((Ods::Descriptor*) p) + 1); + +- dsc desc = *odsDflDesc; ++ dsc desc = odsDflDesc; + desc.dsc_address = const_cast<UCHAR*>(p); + EVL_make_value(tdbb, &desc, &format->fmt_defaults[offset], relation->rel_pool); + diff --git a/external/firebird/ubsan.patch b/external/firebird/ubsan.patch new file mode 100644 index 000000000..5fe298539 --- /dev/null +++ b/external/firebird/ubsan.patch @@ -0,0 +1,287 @@ +--- configure ++++ configure +@@ -21349,7 +21349,7 @@ + char a; + long long b; + }; +- exit((int)&((struct s*)0)->b); ++ exit((int)&((struct s*)1024)->b - 1024); + } + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : +@@ -21384,7 +21384,7 @@ + char a; + double b; + }; +- exit((int)&((struct s*)0)->b); ++ exit((int)&((struct s*)1024)->b - 1024); + } + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : +--- src/common/classes/array.h ++++ src/common/classes/array.h +@@ -149,7 +149,7 @@ + void copyFrom(const Array<T, Storage>& source) + { + ensureCapacity(source.count, false); +- memcpy(data, source.data, sizeof(T) * source.count); ++ if (source.count != 0) memcpy(data, source.data, sizeof(T) * source.count); + count = source.count; + } + +@@ -227,7 +227,7 @@ + fb_assert(count <= FB_MAX_SIZEOF - itemsCount); + ensureCapacity(count + itemsCount); + memmove(data + index + itemsCount, data + index, sizeof(T) * (count - index)); +- memcpy(data + index, items, sizeof(T) * itemsCount); ++ if (itemsCount != 0) memcpy(data + index, items, sizeof(T) * itemsCount); + count += itemsCount; + } + +@@ -242,7 +242,7 @@ + { + fb_assert(count <= FB_MAX_SIZEOF - itemsCount); + ensureCapacity(count + itemsCount); +- memcpy(data + count, items, sizeof(T) * itemsCount); ++ if (itemsCount != 0) memcpy(data + count, items, sizeof(T) * itemsCount); + count += itemsCount; + } + +@@ -294,7 +294,7 @@ + { + fb_assert(newCount >= count); + ensureCapacity(newCount); +- memset(data + count, 0, sizeof(T) * (newCount - count)); ++ if (newCount != count) memset(data + count, 0, sizeof(T) * (newCount - count)); + count = newCount; + } + +@@ -328,7 +328,7 @@ + { + fb_assert(count <= FB_MAX_SIZEOF - L.count); + ensureCapacity(count + L.count); +- memcpy(data + count, L.data, sizeof(T) * L.count); ++ if (L.count != 0) memcpy(data + count, L.data, sizeof(T) * L.count); + count += L.count; + } + +@@ -462,7 +462,7 @@ + + T* newdata = static_cast<T*> + (this->getPool().allocate(sizeof(T) * newcapacity ALLOC_ARGS)); +- if (preserve) ++ if (preserve && count != 0) + memcpy(newdata, data, sizeof(T) * count); + freeData(); + data = newdata; +--- src/common/classes/fb_string.h ++++ src/common/classes/fb_string.h +@@ -674,7 +674,8 @@ + } + StringType& assign(const void* s, size_type n) + { +- memcpy(baseAssign(n), s, n); ++ auto const p = baseAssign(n); ++ if (n != 0) memcpy(p, s, n); + return *this; + } + StringType& assign(const_pointer s) +--- src/common/unicode_util.cpp ++++ src/common/unicode_util.cpp +@@ -187,7 +187,7 @@ + Mutex ciAiTransCacheMutex; + Array<UTransliterator*> ciAiTransCache; + +- void (U_EXPORT2 *uVersionToString)(UVersionInfo versionArray, char* versionString); ++ void (U_EXPORT2 *uVersionToString)(UVersionInfo const versionArray, char* versionString); + + int32_t (U_EXPORT2 *ulocCountAvailable)(); + const char* (U_EXPORT2 *ulocGetAvailable)(int32_t n); +--- src/dsql/StmtNodes.cpp ++++ src/dsql/StmtNodes.cpp +@@ -6643,7 +6643,7 @@ + + void StoreNode::genBlr(DsqlCompilerScratch* dsqlScratch) + { +- const dsql_msg* message = dsqlGenDmlHeader(dsqlScratch, dsqlRse->as<RseNode>()); ++ const dsql_msg* message = dsqlGenDmlHeader(dsqlScratch, dsqlRse == nullptr ? nullptr : dsqlRse->as<RseNode>()); + + dsqlScratch->appendUChar(statement2 ? blr_store2 : blr_store); + GEN_expr(dsqlScratch, dsqlRelation); +--- src/gpre/hsh.cpp ++++ src/gpre/hsh.cpp +@@ -232,7 +232,7 @@ + { + SCHAR c; + +- SLONG value = 0; ++ ULONG value = 0; + + while (c = *string++) + value = (value << 1) + UPPER(c); +--- src/jrd/GlobalRWLock.cpp ++++ src/jrd/GlobalRWLock.cpp +@@ -78,7 +78,7 @@ + + cachedLock = FB_NEW_RPT(getPool(), lockLen) + Lock(tdbb, lockLen, lckType, this, lockCaching ? blocking_ast_cached_lock : NULL); +- memcpy(&cachedLock->lck_key, lockStr, lockLen); ++ if (lockLen != 0) memcpy(&cachedLock->lck_key, lockStr, lockLen); + } + + GlobalRWLock::~GlobalRWLock() +--- src/jrd/Optimizer.cpp ++++ src/jrd/Optimizer.cpp +@@ -368,7 +368,7 @@ + + // Allocate needed indexScratches + +- index_desc* idx = csb_tail->csb_idx->items; ++ index_desc* idx = csb_tail->csb_idx == nullptr ? nullptr : csb_tail->csb_idx->items; + for (int i = 0; i < csb_tail->csb_indices; ++i, ++idx) + indexScratches.add(IndexScratch(p, tdbb, idx, csb_tail)); + } +--- src/jrd/blb.cpp ++++ src/jrd/blb.cpp +@@ -1786,7 +1786,7 @@ + arg.slice_base = array->arr_data; + + SLONG variables[64]; +- memcpy(variables, param, MIN(sizeof(variables), param_length)); ++ if (param_length != 0) memcpy(variables, param, MIN(sizeof(variables), param_length)); + + if (SDL_walk(tdbb->tdbb_status_vector, sdl, array->arr_data, &array_desc->arr_desc, + variables, slice_callback, &arg)) +--- src/jrd/btn.cpp ++++ src/jrd/btn.cpp +@@ -387,7 +387,7 @@ + + put_short(pagePointer, offset); + pagePointer += sizeof(USHORT); +- memmove(pagePointer, data, length); ++ if (length != 0) memmove(pagePointer, data, length); + pagePointer += length; + return pagePointer; + } +@@ -622,7 +622,7 @@ + } + + // Store data +- if (withData) { ++ if (withData && length != 0) { + memcpy(pagePointer, data, length); + } + pagePointer += length; +--- src/jrd/btr.cpp ++++ src/jrd/btr.cpp +@@ -5206,7 +5206,7 @@ + // Push node on end in list + jumpNodes->add(jumpNode); + // Store new data in jumpKey, so a new jump node can calculate prefix +- memcpy(jumpData + jumpNode.prefix, jumpNode.data, jumpNode.length); ++ if (jumpNode.length != 0) memcpy(jumpData + jumpNode.prefix, jumpNode.data, jumpNode.length); + jumpLength = jumpNode.length + jumpNode.prefix; + + // Check if this could be our split point (if we need to split) +@@ -5391,7 +5391,7 @@ + // First, store needed data for beforeInsertNode into tempData. + HalfStaticArray<UCHAR, MAX_KEY> tempBuf; + UCHAR* tempData = tempBuf.getBuffer(newLength); +- memcpy(tempData, beforeInsertNode.data + newPrefix - beforeInsertNode.prefix, newLength); ++ if (newLength != 0) memcpy(tempData, beforeInsertNode.data + newPrefix - beforeInsertNode.prefix, newLength); + + beforeInsertNode.prefix = newPrefix; + beforeInsertNode.length = newLength; +@@ -5611,7 +5611,7 @@ + for (size_t i = 0; i < jumpNodes->getCount(); i++, index++) + { + UCHAR* q = new_key->key_data + walkJumpNode[i].prefix; +- memcpy(q, walkJumpNode[i].data, walkJumpNode[i].length); ++ if (walkJumpNode[i].length != 0) memcpy(q, walkJumpNode[i].data, walkJumpNode[i].length); + if (index == splitJumpNodeIndex) + { + jn = &walkJumpNode[i]; +@@ -5636,7 +5636,7 @@ + const USHORT length = walkJumpNode[i].prefix + walkJumpNode[i].length; + UCHAR* newData = FB_NEW_POOL(*tdbb->getDefaultPool()) UCHAR[length]; + memcpy(newData, new_key->key_data, walkJumpNode[i].prefix); +- memcpy(newData + walkJumpNode[i].prefix, walkJumpNode[i].data, ++ if (walkJumpNode[i].length != 0) memcpy(newData + walkJumpNode[i].prefix, walkJumpNode[i].data, + walkJumpNode[i].length); + delete[] walkJumpNode[i].data; + walkJumpNode[i].prefix = 0; +--- src/jrd/evl.cpp ++++ src/jrd/evl.cpp +@@ -415,7 +415,7 @@ + case dtype_real: + case dtype_sql_time: + case dtype_sql_date: +- value->vlu_misc.vlu_long = *((SLONG*) from.dsc_address); ++ memcpy(&value->vlu_misc.vlu_long, from.dsc_address, sizeof (SLONG)); + return; + + case dtype_int64: +--- src/jrd/lck.cpp ++++ src/jrd/lck.cpp +@@ -488,7 +488,7 @@ + break; + } + +- dbb->dbb_lock_mgr->shutdownOwner(tdbb, owner_handle_ptr); ++ LockManager::shutdownOwner(dbb->dbb_lock_mgr, tdbb, owner_handle_ptr); + } + + +--- src/lock/lock.cpp ++++ src/lock/lock.cpp +@@ -441,7 +441,7 @@ + } + + +-void LockManager::shutdownOwner(thread_db* tdbb, SRQ_PTR* owner_handle) ++void LockManager::shutdownOwner(LockManager* This, thread_db* tdbb, SRQ_PTR* owner_handle) + { + /************************************** + * +@@ -460,8 +460,9 @@ + if (!owner_offset) + return; + +- LockTableGuard guard(this, FB_FUNCTION, owner_offset); ++ LockTableGuard guard(This, FB_FUNCTION, owner_offset); + ++#define SRQ_BASE ((UCHAR*) This->m_sharedMemory->getHeader()) + own* owner = (own*) SRQ_ABS_PTR(owner_offset); + if (!owner->own_count) + return; +@@ -472,7 +473,7 @@ + while (owner->own_ast_count) + { + { // checkout scope +- LockTableCheckout checkout(this, FB_FUNCTION); ++ LockTableCheckout checkout(This, FB_FUNCTION); + EngineCheckout cout(tdbb, FB_FUNCTION, true); + Thread::sleep(10); + } +@@ -484,8 +485,9 @@ + // released before destroying the lock owner. This is not strictly required, + // but it enforces the proper object lifetime discipline through the codebase. + fb_assert(SRQ_EMPTY(owner->own_requests)); ++#define SRQ_BASE ((UCHAR*) m_sharedMemory->getHeader()) + +- purge_owner(owner_offset, owner); ++ This->purge_owner(owner_offset, owner); + + *owner_handle = 0; + } +--- src/lock/lock_proto.h ++++ src/lock/lock_proto.h +@@ -402,7 +402,7 @@ + static void destroy(LockManager*); + + bool initializeOwner(Firebird::CheckStatusWrapper*, LOCK_OWNER_T, UCHAR, SRQ_PTR*); +- void shutdownOwner(thread_db*, SRQ_PTR*); ++ static void shutdownOwner(LockManager* This, thread_db*, SRQ_PTR*); + + SRQ_PTR enqueue(thread_db*, Firebird::CheckStatusWrapper*, SRQ_PTR, const USHORT, + const UCHAR*, const USHORT, UCHAR, lock_ast_t, void*, SINT64, SSHORT, SRQ_PTR); diff --git a/external/firebird/wnt-dbgutil.patch b/external/firebird/wnt-dbgutil.patch new file mode 100644 index 000000000..db859b64f --- /dev/null +++ b/external/firebird/wnt-dbgutil.patch @@ -0,0 +1,63 @@ +--- configure ++++ configure +@@ -18402,44 +18402,6 @@ + fi + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -licuuc" >&5 +-$as_echo_n "checking for main in -licuuc... " >&6; } +-if ${ac_cv_lib_icuuc_main+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-licuuc $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-int +-main () +-{ +-return main (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_icuuc_main=yes +-else +- ac_cv_lib_icuuc_main=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_main" >&5 +-$as_echo "$ac_cv_lib_icuuc_main" >&6; } +-if test "x$ac_cv_lib_icuuc_main" = xyes; then : +- ICU_OK=yes +-else +- as_fn_error $? "ICU support not found - please install development ICU package" "$LINENO" 5 +-fi +- +- +- + pre_save_restore_cflags=$CFLAGS + pre_save_restore_cxxflags=$CXXFLAGS + pre_save_restore_libs=$LIBS +--- src/common/unicode_util.cpp ++++ src/common/unicode_util.cpp +@@ -58,8 +58,13 @@ + + namespace { + #if defined(WIN_NT) ++#if defined(MSVC_USE_DEBUG_RUNTIME) ++const char* const inTemplate = "icuind%s.dll"; ++const char* const ucTemplate = "icuucd%s.dll"; ++#else + const char* const inTemplate = "icuin%s.dll"; + const char* const ucTemplate = "icuuc%s.dll"; ++#endif + #elif defined(DARWIN) + //const char* const inTemplate = "/Library/Frameworks/Firebird.framework/Versions/A/Libraries/libicui18n.dylib"; + //const char* const ucTemplate = "/Library/Frameworks/Firebird.framework/versions/A/Libraries/libicuuc.dylib"; diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk new file mode 100644 index 000000000..b82c76573 --- /dev/null +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -0,0 +1,36 @@ +# -*- 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,fontconfig)) + +$(eval $(call gb_ExternalProject_use_externals,fontconfig,\ + expat \ + freetype \ +)) + +$(eval $(call gb_ExternalProject_register_targets,fontconfig,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,fontconfig,build) : + $(call gb_Trace_StartRange,fontconfig,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \ + ./configure \ + --disable-shared \ + --disable-silent-rules \ + $(if $(filter ANDROID,$(OS)),--with-arch=arm) \ + --with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \ + --with-expat-lib=$(gb_StaticLibrary_WORKDIR) \ + --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + && $(MAKE) -C src \ + ) + $(call gb_Trace_EndRange,fontconfig,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/fontconfig/Makefile b/external/fontconfig/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/fontconfig/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/fontconfig/Module_fontconfig.mk b/external/fontconfig/Module_fontconfig.mk new file mode 100644 index 000000000..e755f8610 --- /dev/null +++ b/external/fontconfig/Module_fontconfig.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,fontconfig)) + +$(eval $(call gb_Module_add_targets,fontconfig,\ + ExternalProject_fontconfig \ + UnpackedTarball_fontconfig \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/fontconfig/README b/external/fontconfig/README new file mode 100644 index 000000000..220ee6078 --- /dev/null +++ b/external/fontconfig/README @@ -0,0 +1,6 @@ +This "bundled" fontconfig is built only in an Android build + +Fontconfig is a font configuration and customization library. It is designed to locate fonts +within the system and select them according to requirements specified by applications. + +From [ http://packages.debian.org/squeeze/fontconfig ]
\ No newline at end of file diff --git a/external/fontconfig/UnpackedTarball_fontconfig.mk b/external/fontconfig/UnpackedTarball_fontconfig.mk new file mode 100644 index 000000000..6026a817c --- /dev/null +++ b/external/fontconfig/UnpackedTarball_fontconfig.mk @@ -0,0 +1,18 @@ +# -*- 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,fontconfig)) + +$(eval $(call gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL),,fontconfig)) + +$(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\ + external/fontconfig/fontconfig-2.12.1.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/fontconfig/fontconfig-2.12.1.patch.1 b/external/fontconfig/fontconfig-2.12.1.patch.1 new file mode 100644 index 000000000..f348d2aa8 --- /dev/null +++ b/external/fontconfig/fontconfig-2.12.1.patch.1 @@ -0,0 +1,135 @@ +diff -up fontconfig/configure.dt fontconfig/configure +--- fontconfig/configure.dt 2017-02-01 22:07:29.671668568 +0100 ++++ fontconfig/configure 2017-02-01 22:09:53.335215490 +0100 +@@ -10469,7 +10469,7 @@ _LT_EOF + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' + archive_expsym_cmds='' + ;; + m68k) +@@ -10485,7 +10485,7 @@ _LT_EOF + allow_undefined_flag=unsupported + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags -o $lib' + else + ld_shlibs=no + fi +@@ -10519,7 +10519,7 @@ _LT_EOF + ;; + + haiku*) +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' + link_all_deplibs=yes + ;; + +@@ -10614,13 +10614,13 @@ _LT_EOF + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac +- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib' + + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in +@@ -10650,8 +10650,8 @@ _LT_EOF + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -10669,8 +10669,8 @@ _LT_EOF + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -10698,8 +10698,8 @@ _LT_EOF + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -10716,8 +10716,8 @@ _LT_EOF + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -11016,7 +11016,7 @@ fi + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' + archive_expsym_cmds='' + ;; + m68k) +@@ -11285,7 +11285,7 @@ fi + + irix5* | irix6* | nonstopux*) + if test yes = "$GCC"; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +@@ -11313,7 +11313,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 + $as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test yes = "$lt_cv_irix_exported_symbol"; then +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' +@@ -11408,7 +11408,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > + osf3*) + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' +- archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' +@@ -11421,7 +11421,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' +- archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk new file mode 100644 index 000000000..3f4a719d5 --- /dev/null +++ b/external/freetype/ExternalProject_freetype.mk @@ -0,0 +1,41 @@ +# -*- 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,freetype)) + +$(eval $(call gb_ExternalProject_register_targets,freetype,\ + build \ +)) + +ifeq ($(OS),WNT) +$(call gb_ExternalProject_get_state_target,freetype,build) : + $(call gb_Trace_StartRange,freetype,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + cd ../builds/win32/vc2010/ && \ + msbuild.exe freetype.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + ,objs) + $(call gb_Trace_EndRange,freetype,EXTERNAL) +else +$(call gb_ExternalProject_get_state_target,freetype,build) : + $(call gb_Trace_StartRange,freetype,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure \ + --disable-shared \ + --without-zlib \ + --without-bzip2 \ + --without-harfbuzz \ + --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \ + --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \ + && $(MAKE) install \ + && touch $@ ) + $(call gb_Trace_EndRange,freetype,EXTERNAL) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/freetype/Makefile b/external/freetype/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/freetype/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/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk new file mode 100644 index 000000000..290014c47 --- /dev/null +++ b/external/freetype/Module_freetype.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,freetype)) + +$(eval $(call gb_Module_add_targets,freetype,\ + ExternalProject_freetype \ + UnpackedTarball_freetype \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/freetype/README b/external/freetype/README new file mode 100644 index 000000000..481466432 --- /dev/null +++ b/external/freetype/README @@ -0,0 +1,6 @@ +FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, +and portable while capable of producing high-quality output (glyph images). It can be +used in graphics libraries, display servers, font conversion tools, text image generation +tools, and many other products as well. + +From [http://freetype.sourceforge.net/freetype2/index.html] diff --git a/external/freetype/UnpackedTarball_freetype.mk b/external/freetype/UnpackedTarball_freetype.mk new file mode 100644 index 000000000..6f724d177 --- /dev/null +++ b/external/freetype/UnpackedTarball_freetype.mk @@ -0,0 +1,18 @@ +# -*- 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,freetype)) + +$(eval $(call gb_UnpackedTarball_set_tarball,freetype,$(FREETYPE_TARBALL),,freetype)) + +$(eval $(call gb_UnpackedTarball_add_patches,freetype,\ + external/freetype/freetype-2.6.5.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/freetype/freetype-2.6.5.patch.1 b/external/freetype/freetype-2.6.5.patch.1 new file mode 100644 index 000000000..a9c231cbe --- /dev/null +++ b/external/freetype/freetype-2.6.5.patch.1 @@ -0,0 +1,158 @@ +diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure +--- freetype/builds/unix/configure.dt 2017-02-01 22:14:45.206257952 +0100 ++++ freetype/builds/unix/configure 2017-02-01 22:16:31.076183707 +0100 +@@ -8858,7 +8858,7 @@ + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' + archive_expsym_cmds='' + ;; + m68k) +@@ -8874,7 +8874,7 @@ + allow_undefined_flag=unsupported + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags -o $lib' + else + ld_shlibs=no + fi +@@ -8908,7 +8908,7 @@ + ;; + + haiku*) +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' + link_all_deplibs=yes + ;; + +@@ -9003,13 +9003,13 @@ + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac +- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib' + + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in +@@ -9039,8 +9039,8 @@ + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -9058,8 +9058,8 @@ + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -9087,8 +9087,8 @@ + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -9105,8 +9105,8 @@ + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -9405,7 +9405,7 @@ + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' + archive_expsym_cmds='' + ;; + m68k) +@@ -9674,7 +9674,7 @@ + + irix5* | irix6* | nonstopux*) + if test yes = "$GCC"; then +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +@@ -9702,7 +9702,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 + $as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test yes = "$lt_cv_irix_exported_symbol"; then +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' +@@ -9797,7 +9797,7 @@ + osf3*) + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' +- archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' +@@ -9810,7 +9810,7 @@ + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' +- archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ++ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' +@@ -13143,10 +13143,10 @@ + XX_CFLAGS="-Wall" + case "$host" in + *-*-mingw*) +- XX_ANSIFLAGS="-pedantic" ++ XX_ANSIFLAGS="" + ;; + *-*-aix*) +- XX_ANSIFLAGS="-pedantic" ++ XX_ANSIFLAGS="" + ;; + *) + GCC_VERSION=`$CC -dumpversion` +@@ -13195,7 +13195,7 @@ + if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, adding to XX_ANSIFLAGS" >&5 + $as_echo "ok, adding to XX_ANSIFLAGS" >&6; } +- XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}" ++ XX_ANSIFLAGS="${XX_ANSIFLAGS}" + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +diff -up freetype/configure.dt freetype/configure diff --git a/external/glm/Makefile b/external/glm/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/glm/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/glm/Module_glm.mk b/external/glm/Module_glm.mk new file mode 100644 index 000000000..617b067a2 --- /dev/null +++ b/external/glm/Module_glm.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/. +# + +$(eval $(call gb_Module_Module,glm)) + +$(eval $(call gb_Module_add_targets,glm,\ + UnpackedTarball_glm \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/glm/README b/external/glm/README new file mode 100644 index 000000000..30122f67b --- /dev/null +++ b/external/glm/README @@ -0,0 +1,3 @@ +Glm provides a header only library for OpenGL mathematics. + +It is available from http://glm.g-truc.net/0.9.4/index.html diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk new file mode 100644 index 000000000..934621eac --- /dev/null +++ b/external/glm/UnpackedTarball_glm.mk @@ -0,0 +1,23 @@ +# -*- 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,glm)) + +$(eval $(call gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchflags,glm,$(if $(filter MSC,$(COM)),--binary))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,glm, \ + external/glm/clang-cl.patch.0 \ + external/glm/c++20.patch.0 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/glm/c++20.patch.0 b/external/glm/c++20.patch.0 new file mode 100644 index 000000000..34a40b5ef --- /dev/null +++ b/external/glm/c++20.patch.0 @@ -0,0 +1,11 @@ +--- glm/detail/type_half.inl ++++ glm/detail/type_half.inl +@@ -6,7 +6,7 @@ + volatile float f = 1e10; + + for(int i = 0; i < 10; ++i) +- f *= f; // this will overflow before the for loop terminates ++ f = f * f; // this will overflow before the for loop terminates + return f; + } + diff --git a/external/glm/clang-cl.patch.0 b/external/glm/clang-cl.patch.0 new file mode 100644 index 000000000..44713a196 --- /dev/null +++ b/external/glm/clang-cl.patch.0 @@ -0,0 +1,14 @@ +# "#pragma intrinsic" not (yet?) handled in the "if (LangOpts.MicrosoftExt)" +# block in Preprocessor::RegisterBuiltinPragmas in Clang's lib/Lex/Pragma.cpp: +--- glm/detail/func_integer.inl ++++ glm/detail/func_integer.inl +@@ -3,7 +3,9 @@ + #include "_vectorize.hpp" + #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC) + # include <intrin.h> ++#if !defined __clang__^M + # pragma intrinsic(_BitScanReverse) ++#endif + #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC) + #include <limits> + diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk b/external/gpgmepp/ExternalPackage_gpgmepp.mk new file mode 100644 index 000000000..67c3dc64f --- /dev/null +++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk @@ -0,0 +1,40 @@ +# -*- 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_ExternalPackage_ExternalPackage,gpgmepp,gpgmepp)) + +$(eval $(call gb_ExternalPackage_use_external_project,gpgmepp,gpgmepp)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) + +ifeq ($(OS),LINUX) + +$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.4.0)) +$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.18.0)) + +else ifeq ($(OS),MACOSX) + +$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.6.dylib,lang/cpp/src/.libs/libgpgmepp.6.dylib)) +$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.11.dylib,src/.libs/libgpgme.11.dylib)) + +else ifeq ($(OS),WNT) + +$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/gpgme-w32spawn.exe,src/gpgme-w32spawn.exe)) + +endif + +# If a tool executed during the build (like svidl) requires these gpgmepp libraries, it will also +# require those libassuan and libgpg-error libraries that these gpgmepp libraries link against: +$(call gb_Package_get_target_for_build,gpgmepp): \ + $(call gb_Helper_optional,LIBASSUAN,$(call gb_Package_get_target_for_build,libassuan)) \ + $(call gb_Helper_optional,LIBGPGERROR,$(call gb_Package_get_target_for_build,libgpg-error)) + +endif # $(DISABLE_DYNLOADING) + +# vim: set noet sw=4 ts=4: diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk new file mode 100644 index 000000000..989844465 --- /dev/null +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -0,0 +1,85 @@ +# -*- 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,gpgmepp)) + +$(eval $(call gb_ExternalProject_register_targets,gpgmepp,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_autoconf,gpgmepp,build)) + +$(eval $(call gb_ExternalProject_use_externals,gpgmepp,\ + libgpg-error \ + libassuan \ +)) + +ifeq ($(COM),MSC) +gb_ExternalProject_gpgmepp_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) +gb_ExternalProject_gpgmepp_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64) +$(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_get_target,cpp) + $(call gb_Trace_StartRange,gpgmepp,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + autoreconf \ + && ./configure \ + --disable-shared \ + --disable-languages \ + --disable-gpgconf-test \ + --disable-gpg-test \ + --disable-gpgsm-test \ + --disable-g13-test \ + --disable-glibtest \ + CFLAGS='$(CFLAGS) \ + $(if $(ENABLE_OPTIMIZED), \ + $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ + $(if $(call gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \ + --host=$(gb_ExternalProject_gpgmepp_host) \ + RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + MAKE=$(MAKE) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,gpgmepp,EXTERNAL) +else +$(call gb_ExternalProject_get_state_target,gpgmepp,build): + $(call gb_Trace_StartRange,gpgmepp,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + autoreconf \ + && ./configure \ + --disable-gpg-test \ + --enable-languages="cpp" \ + GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ + GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ + LIBASSUAN_CFLAGS="$(LIBASSUAN_CFLAGS)" \ + LIBASSUAN_LIBS="$(LIBASSUAN_LIBS)" \ + CFLAGS='$(CFLAGS) \ + $(if $(ENABLE_OPTIMIZED), \ + $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ + $(if $(call gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \ + CXXFLAGS='$(CXXFLAGS) \ + $(if $(ENABLE_OPTIMIZED), \ + $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ + $(if $(ENABLE_DBGUTIL),-D_GLIBCXX_DEBUG) \ + $(if $(call gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \ + $(if $(filter LINUX,$(OS)), \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/lang/cpp/src/.libs/libgpgmepp.6.dylib \ + $(EXTERNAL_WORKDIR)/src/.libs/libgpgme.11.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,gpgmepp,EXTERNAL) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/gpgmepp/Library_gpgmepp.mk b/external/gpgmepp/Library_gpgmepp.mk new file mode 100644 index 000000000..a7d0ba349 --- /dev/null +++ b/external/gpgmepp/Library_gpgmepp.mk @@ -0,0 +1,87 @@ +# -*- 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_Library_Library,gpgmepp)) + +$(eval $(call gb_Library_use_unpacked,gpgmepp,gpgmepp)) + +$(eval $(call gb_Library_use_externals,gpgmepp,\ + libgpg-error \ + libassuan \ +)) + +$(eval $(call gb_LinkTarget_use_external_project,\ + $(call gb_Library_get_linktarget,gpgmepp),gpgmepp,full)) + +$(eval $(call gb_Library_set_warnings_disabled,gpgmepp)) + +$(eval $(call gb_Library_set_include,gpgmepp,\ + -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \ + -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/interfaces \ + -I$(call gb_UnpackedTarball_get_dir,gpgmepp) \ + -I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \ + -I$(call gb_UnpackedTarball_get_dir,libgpg-error)/src \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_libs,gpgmepp,\ + ws2_32.lib shell32.lib \ + -LIBPATH:$(call gb_UnpackedTarball_get_dir,gpgmepp)/src/.libs libgpgme.lib \ +)) + +$(eval $(call gb_Library_add_defs,gpgmepp,\ + -DHAVE_CONFIG_H \ + -DBUILDING_GPGMEPP \ + -DDLL_EXPORT \ + -DPIC \ +)) + +$(eval $(call gb_Library_set_generated_cxx_suffix,gpgmepp,cpp)) + +$(eval $(call gb_Library_add_generated_exception_objects,gpgmepp,\ + UnpackedTarball/gpgmepp/lang/cpp/src/callbacks \ + UnpackedTarball/gpgmepp/lang/cpp/src/configuration \ + UnpackedTarball/gpgmepp/lang/cpp/src/context \ + UnpackedTarball/gpgmepp/lang/cpp/src/context_vanilla \ + UnpackedTarball/gpgmepp/lang/cpp/src/data \ + UnpackedTarball/gpgmepp/lang/cpp/src/decryptionresult \ + UnpackedTarball/gpgmepp/lang/cpp/src/defaultassuantransaction \ + UnpackedTarball/gpgmepp/lang/cpp/src/editinteractor \ + UnpackedTarball/gpgmepp/lang/cpp/src/encryptionresult \ + UnpackedTarball/gpgmepp/lang/cpp/src/engineinfo \ + UnpackedTarball/gpgmepp/lang/cpp/src/eventloopinteractor \ + UnpackedTarball/gpgmepp/lang/cpp/src/exception \ + UnpackedTarball/gpgmepp/lang/cpp/src/gpgadduserideditinteractor \ + UnpackedTarball/gpgmepp/lang/cpp/src/gpgagentgetinfoassuantransaction \ + UnpackedTarball/gpgmepp/lang/cpp/src/gpggencardkeyinteractor \ + UnpackedTarball/gpgmepp/lang/cpp/src/gpgsetexpirytimeeditinteractor \ + UnpackedTarball/gpgmepp/lang/cpp/src/gpgsetownertrusteditinteractor \ + UnpackedTarball/gpgmepp/lang/cpp/src/gpgsignkeyeditinteractor \ + UnpackedTarball/gpgmepp/lang/cpp/src/importresult \ + UnpackedTarball/gpgmepp/lang/cpp/src/key \ + UnpackedTarball/gpgmepp/lang/cpp/src/keygenerationresult \ + UnpackedTarball/gpgmepp/lang/cpp/src/keylistresult \ + UnpackedTarball/gpgmepp/lang/cpp/src/scdgetinfoassuantransaction \ + UnpackedTarball/gpgmepp/lang/cpp/src/signingresult \ + UnpackedTarball/gpgmepp/lang/cpp/src/swdbresult \ + UnpackedTarball/gpgmepp/lang/cpp/src/tofuinfo \ + UnpackedTarball/gpgmepp/lang/cpp/src/trustitem \ + UnpackedTarball/gpgmepp/lang/cpp/src/verificationresult \ + UnpackedTarball/gpgmepp/lang/cpp/src/vfsmountresult \ +)) + +ifeq ($(COM),MSC) +ifeq ($(COM_IS_CLANG),TRUE) +$(eval $(call gb_Library_add_cxxflags,gpgmepp, \ + -Wno-c++11-narrowing \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/gpgmepp/Makefile b/external/gpgmepp/Makefile new file mode 100644 index 000000000..569ad8a0b --- /dev/null +++ b/external/gpgmepp/Makefile @@ -0,0 +1,14 @@ +# -*- 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/. +# + +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/gpgmepp/Module_gpgmepp.mk b/external/gpgmepp/Module_gpgmepp.mk new file mode 100644 index 000000000..5763ccedb --- /dev/null +++ b/external/gpgmepp/Module_gpgmepp.mk @@ -0,0 +1,26 @@ +# -*- 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,gpgmepp)) + +$(eval $(call gb_Module_add_targets,gpgmepp,\ + UnpackedTarball_gpgmepp \ + ExternalProject_gpgmepp \ + ExternalPackage_gpgmepp \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,gpgmepp,\ + Library_gpgmepp \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/gpgmepp/README b/external/gpgmepp/README new file mode 100644 index 000000000..149ca3b5e --- /dev/null +++ b/external/gpgmepp/README @@ -0,0 +1,7 @@ +A library for easy access to GnuPG (GnuPG Made Easy) +[https://www.gnupg.org/related_software/gpgme/index.html] + +(The upstream project and its git repo at <https://dev.gnupg.org/source/gpgme/> are called "gpgme", +not "gpgmepp". This external module was renamed from external/gpgme to external/gpgmepp with +50a55d862034b7a06510c014332236f44e306831 "gpg4libre: cleanup gpgme & add gbuild lib for gpgmepp": +"This moves the external to gpgmepp, since that's what we _actually_ link against [...]") diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk new file mode 100644 index 000000000..1b0468fc6 --- /dev/null +++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk @@ -0,0 +1,37 @@ +# -*- 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,gpgmepp)) + +$(eval $(call gb_UnpackedTarball_set_tarball,gpgmepp,$(GPGME_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,gpgmepp,0)) + +# * external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch upstreamed at +# <https://dev.gnupg.org/T4471> "No gpgmepp API to call gpgme_set_global_flag" +# * external/gpgmepp/version.patch upstream at <https://dev.gnupg.org/T4168> "gpgme: `make dist` +# introduced VERSION can clash with new C++ <version>": +$(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \ + external/gpgmepp/find-libgpg-error-libassuan.patch \ + external/gpgmepp/fix-autoconf-macros.patch \ + external/gpgmepp/add-minimal-keyexport.patch \ + $(if $(filter MSC,$(COM)),external/gpgmepp/w32-build-fixes.patch.1) \ + $(if $(filter MSC,$(COM)),external/gpgmepp/w32-disable-docs.patch.1) \ + $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-win32-macro.patch.1) \ + $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-libtool.patch.1) \ + $(if $(filter MSC,$(COM)),external/gpgmepp/w32-add-initializer.patch.1) \ + external/gpgmepp/w32-build-fixes-2.patch \ + external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch \ + $(if $(filter LINUX,$(OS)),external/gpgmepp/asan.patch) \ + $(if $(filter LINUX,$(OS)),external/gpgmepp/rpath.patch) \ + external/gpgmepp/gcc9.patch \ + external/gpgmepp/version.patch \ + external/gpgmepp/ubsan.patch \ +)) +# vim: set noet sw=4 ts=4: diff --git a/external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch b/external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch new file mode 100644 index 000000000..fade88a3e --- /dev/null +++ b/external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch @@ -0,0 +1,27 @@ +diff -ur lang/cpp/src/context.cpp.old lang/cpp/src/context.cpp +--- lang/cpp/src/context.cpp.old 2019-04-20 16:03:09.575605300 +0300 ++++ lang/cpp/src/context.cpp 2019-04-20 16:06:43.078419700 +0300 +@@ -1656,6 +1656,11 @@ + return Error(gpgme_engine_check_version(p)); + } + ++int GpgME::setGlobalFlag(const char *name, const char *value) ++{ ++ return gpgme_set_global_flag(name, value); ++} ++ + static const unsigned long supported_features = 0 + | GpgME::ValidatingKeylistModeFeature + | GpgME::CancelOperationFeature +diff -ur lang/cpp/src/global.h lang/cpp/src/global.h +--- lang/cpp/src/global.h.old 2016-09-07 09:48:44.000000000 +0300 ++++ lang/cpp/src/global.h 2019-04-20 16:06:41.918912600 +0300 +@@ -95,6 +95,8 @@ + GPGMEPP_EXPORT Error checkEngine(Protocol proto); + GPGMEPP_EXPORT Error checkEngine(Engine engine); + ++GPGMEPP_EXPORT int setGlobalFlag(const char *name, const char *value); ++ + GPGMEPP_EXPORT GIOChannel *getGIOChannel(int fd); + GPGMEPP_EXPORT QIODevice *getQIODevice(int fd); + diff --git a/external/gpgmepp/add-minimal-keyexport.patch b/external/gpgmepp/add-minimal-keyexport.patch new file mode 100644 index 000000000..abaeb1589 --- /dev/null +++ b/external/gpgmepp/add-minimal-keyexport.patch @@ -0,0 +1,68 @@ +--- lang/cpp/src/context.h.bak 2017-10-18 12:28:00.898945587 +0200 ++++ lang/cpp/src/context.h 2017-10-18 12:28:35.794832395 +0200 +@@ -178,10 +178,10 @@ + // Key Export + // + +- GpgME::Error exportPublicKeys(const char *pattern, Data &keyData); +- GpgME::Error exportPublicKeys(const char *pattern[], Data &keyData); +- GpgME::Error startPublicKeyExport(const char *pattern, Data &keyData); +- GpgME::Error startPublicKeyExport(const char *pattern[], Data &keyData); ++ GpgME::Error exportPublicKeys(const char *pattern, Data &keyData, bool minimal=false); ++ GpgME::Error exportPublicKeys(const char *pattern[], Data &keyData, bool minimal=false); ++ GpgME::Error startPublicKeyExport(const char *pattern, Data &keyData, bool minimal=false); ++ GpgME::Error startPublicKeyExport(const char *pattern[], Data &keyData, bool minimal=false); + + // + // Key Import +--- lang/cpp/src/context.cpp.bak 2017-10-18 12:27:50.830978224 +0200 ++++ lang/cpp/src/context.cpp 2017-10-18 12:30:13.278515603 +0200 +@@ -557,14 +557,14 @@ + } + } + +-Error Context::exportPublicKeys(const char *pattern, Data &keyData) ++Error Context::exportPublicKeys(const char *pattern, Data &keyData, bool minimal) + { + d->lastop = Private::Export; + Data::Private *const dp = keyData.impl(); +- return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, 0, dp ? dp->data : 0)); ++ return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0)); + } + +-Error Context::exportPublicKeys(const char *patterns[], Data &keyData) ++Error Context::exportPublicKeys(const char *patterns[], Data &keyData, bool minimal) + { + d->lastop = Private::Export; + #ifndef HAVE_GPGME_EXT_KEYLIST_MODE_EXTERNAL_NONBROKEN +@@ -574,17 +574,17 @@ + } + #endif + Data::Private *const dp = keyData.impl(); +- return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, 0, dp ? dp->data : 0)); ++ return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0)); + } + +-Error Context::startPublicKeyExport(const char *pattern, Data &keyData) ++Error Context::startPublicKeyExport(const char *pattern, Data &keyData, bool minimal) + { + d->lastop = Private::Export; + Data::Private *const dp = keyData.impl(); +- return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, 0, dp ? dp->data : 0)); ++ return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0)); + } + +-Error Context::startPublicKeyExport(const char *patterns[], Data &keyData) ++Error Context::startPublicKeyExport(const char *patterns[], Data &keyData, bool minimal) + { + d->lastop = Private::Export; + #ifndef HAVE_GPGME_EXT_KEYLIST_MODE_EXTERNAL_NONBROKEN +@@ -594,7 +594,7 @@ + } + #endif + Data::Private *const dp = keyData.impl(); +- return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, 0, dp ? dp->data : 0)); ++ return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, minimal ? GPGME_EXPORT_MODE_MINIMAL : 0, dp ? dp->data : 0)); + } + + ImportResult Context::importKeys(const Data &data) diff --git a/external/gpgmepp/asan.patch b/external/gpgmepp/asan.patch new file mode 100644 index 000000000..16d97f6ff --- /dev/null +++ b/external/gpgmepp/asan.patch @@ -0,0 +1,12 @@ +--- src/posix-io.c ++++ src/posix-io.c +@@ -468,6 +468,9 @@ + + if (atfork) + atfork (atforkvalue, 0); ++ char const * ld_path = getenv("LIBO_LD_PATH"); ++ if (ld_path && setenv("LD_LIBRARY_PATH", ld_path, 1) != 0) ++ abort(); + + /* First close all fds which will not be inherited. If we + * have closefrom(2) we first figure out the highest fd we diff --git a/external/gpgmepp/find-libgpg-error-libassuan.patch b/external/gpgmepp/find-libgpg-error-libassuan.patch new file mode 100644 index 000000000..2ddd4d2f2 --- /dev/null +++ b/external/gpgmepp/find-libgpg-error-libassuan.patch @@ -0,0 +1,59 @@ +diff --git a/configure.ac b/configure.ac +index f28480b..92a3e85 100644 +--- configure.ac ++++ configure.ac +@@ -674,15 +674,34 @@ AC_CHECK_FUNCS(setlocale) + + # Checking for libgpg-error. + have_gpg_error=no +-AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION", +- have_gpg_error=yes, have_gpg_error=no) ++if test "x${GPG_ERROR_CFLAGS}" = x; then ++ AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION", ++ have_gpg_error=yes, have_gpg_error=no) ++else ++ have_gpg_error=yes ++ GPG_ERROR_CFLAGS="$GPG_ERROR_CFLAGS" ++ GPG_ERROR_LIBS="$GPG_ERROR_LIBS" ++ AC_SUBST(GPG_ERROR_CFLAGS) ++ AC_SUBST(GPG_ERROR_LIBS) ++ ++fi ++ + AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME, + [The default error source for GPGME.]) + + # And for libassuan. + have_libassuan=no +-AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION", ++if test "x${LIBASSUAN_CFLAGS}" = x; then ++ AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION", + have_libassuan=yes, have_libassuan=no) ++else ++ have_libassuan=yes ++ LIBASSUAN_CFLAGS="$LIBASSUAN_CFLAGS" ++ LIBASSUAN_LIBS="$LIBASSUAN_LIBS" ++ AC_SUBST(LIBASSUAN_CFLAGS) ++ AC_SUBST(LIBASSUAN_LIBS) ++fi ++ + if test "$have_libassuan" = "yes"; then + AC_DEFINE_UNQUOTED(GPGME_LIBASSUAN_VERSION, "$libassuan_version", + [version of the libassuan library]) +diff --git a/src/Makefile.am b/src/Makefile.am +index ce6f1d4..6b1d835 100644 +--- src/Makefile.am ++++ src/Makefile.am +@@ -97,10 +97,10 @@ endif + + # We use a global CFLAGS setting for all library + # versions, because then every object file is only compiled once. +-AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GLIB_CFLAGS@ ++AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@ @GLIB_CFLAGS@ + + gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h +-gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ ++gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ + + + if HAVE_W32_SYSTEM diff --git a/external/gpgmepp/fix-autoconf-macros.patch b/external/gpgmepp/fix-autoconf-macros.patch new file mode 100644 index 000000000..627c7b152 --- /dev/null +++ b/external/gpgmepp/fix-autoconf-macros.patch @@ -0,0 +1,39 @@ +diff -ur gpgme.org/configure.ac gpgme/configure.ac +--- configure.ac 2017-02-16 15:18:45.051417378 +0100 ++++ configure.ac~ 2017-02-16 15:20:03.635059285 +0100 +@@ -35,6 +35,11 @@ + # decimalized short revision number, a beta version string, and a flag + # indicating a development version (mym4_isgit). Note that the m4 + # processing is done by autoconf and not during the configure run. ++m4_define([m4_chomp_all], ++[m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [ ++/], [/ ]), [/*$]), [$1])]) ++ ++m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))]) + m4_define(mym4_version, + [mym4_version_major.mym4_version_minor.mym4_version_micro]) + m4_define([mym4_revision], +@@ -90,7 +90,22 @@ + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR(src/gpgme.h.in) + AC_CONFIG_HEADER(config.h) +-AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) ++ ++dnl Initialize automake. automake < 1.12 didn't have serial-tests and ++dnl gives an error if it sees this, but for automake >= 1.13 ++dnl serial-tests is required so we have to include it. Solution is to ++dnl test for the version of automake (by running an external command) ++dnl and provide it if necessary. Note we have to do this entirely using ++dnl m4 macros since automake queries this macro by running ++dnl 'autoconf --trace ...'. ++m4_define([serial_tests], [ ++ m4_esyscmd([automake --version | ++ head -1 | ++ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}' ++ ]) ++]) ++AM_INIT_AUTOMAKE(foreign serial_tests dist-bzip2 no-dist-gzip) dnl NB: Do not [quote] this parameter. ++ + AM_MAINTAINER_MODE + AC_CANONICAL_HOST + AM_SILENT_RULES diff --git a/external/gpgmepp/gcc9.patch b/external/gpgmepp/gcc9.patch new file mode 100644 index 000000000..c2a9fd444 --- /dev/null +++ b/external/gpgmepp/gcc9.patch @@ -0,0 +1,10 @@ +--- lang/cpp/src/key.h ++++ lang/cpp/src/key.h +@@ -62,6 +62,7 @@ + /* implicit */ Key(const Null &); + Key(const shared_gpgme_key_t &key); + Key(gpgme_key_t key, bool acquireRef); ++ Key(Key const &) = default; + + static const Null null; + diff --git a/external/gpgmepp/rpath.patch b/external/gpgmepp/rpath.patch new file mode 100644 index 000000000..e83dcf276 --- /dev/null +++ b/external/gpgmepp/rpath.patch @@ -0,0 +1,12 @@ +--- configure.ac ++++ configure.ac +@@ -176,6 +176,9 @@ + LT_INIT([win32-dll disable-static]) + LT_LANG([Windows Resource]) + ++hardcode_libdir_flag_spec= ++hardcode_libdir_flag_spec_CXX= ++ + # For now we hardcode the use of version scripts. It would be better + # to write a test for this or even implement this within libtool. + have_ld_version_script=no diff --git a/external/gpgmepp/ubsan.patch b/external/gpgmepp/ubsan.patch new file mode 100644 index 000000000..5a6e6dcdc --- /dev/null +++ b/external/gpgmepp/ubsan.patch @@ -0,0 +1,52 @@ +--- src/engine-gpg.c ++++ src/engine-gpg.c +@@ -60,6 +60,15 @@ + building command line to this location. */ + char arg[1]; /* Used if data above is not used. */ + }; ++struct arg_without_data_s ++{ ++ struct arg_and_data_s *next; ++ gpgme_data_t data; ++ int inbound; ++ int dup_to; ++ int print_fd; ++ int *arg_locp; ++}; + + + struct fd_data_map_s +@@ -299,23 +308,24 @@ + a = malloc (sizeof *a - 1); + if (!a) + return gpg_error_from_syserror (); +- a->next = NULL; +- a->data = data; +- a->inbound = inbound; +- a->arg_locp = NULL; ++ struct arg_without_data_s *a2 = (struct arg_without_data_s *)a; ++ a2->next = NULL; ++ a2->data = data; ++ a2->inbound = inbound; ++ a2->arg_locp = NULL; + + if (dup_to == -2) + { +- a->print_fd = 1; +- a->dup_to = -1; ++ a2->print_fd = 1; ++ a2->dup_to = -1; + } + else + { +- a->print_fd = 0; +- a->dup_to = dup_to; ++ a2->print_fd = 0; ++ a2->dup_to = dup_to; + } + *gpg->argtail = a; +- gpg->argtail = &a->next; ++ gpg->argtail = &a2->next; + return 0; + } + diff --git a/external/gpgmepp/version.patch b/external/gpgmepp/version.patch new file mode 100644 index 000000000..21d3b680c --- /dev/null +++ b/external/gpgmepp/version.patch @@ -0,0 +1,4 @@ +--- VERSION ++++ /dev/null +@@ -1,1 +0,0 @@ +-1.9.0 diff --git a/external/gpgmepp/w32-add-initializer.patch.1 b/external/gpgmepp/w32-add-initializer.patch.1 new file mode 100644 index 000000000..b33f0d42a --- /dev/null +++ b/external/gpgmepp/w32-add-initializer.patch.1 @@ -0,0 +1,16 @@ +Make sure the gpgrt_lock_init gets called in libgpg-error, otherwise +several critical section statics are uninitialized + +diff -ur gpgmepp.org/src/version.c gpgmepp/src/version.c +--- gpgmepp.org/src/version.c 2016-11-16 13:22:41.000000000 +0100 ++++ gpgmepp/src/version.c 2017-11-23 17:16:35.218735200 +0100 +@@ -66,6 +66,9 @@ + return; + + #ifdef HAVE_W32_SYSTEM ++ // initialize libgpg-error stuff ++ gpg_err_init(); ++ + /* We need to make sure that the sockets are initialized. */ + { + WSADATA wsadat; diff --git a/external/gpgmepp/w32-build-fixes-2.patch b/external/gpgmepp/w32-build-fixes-2.patch new file mode 100644 index 000000000..062c14409 --- /dev/null +++ b/external/gpgmepp/w32-build-fixes-2.patch @@ -0,0 +1,12 @@ +Avoid MFC dependency - can go with very basic includes instead + +--- src/versioninfo.rc.in~ 2017-03-28 15:12:30.000000000 +0200 ++++ src/versioninfo.rc.in 2017-11-29 04:22:18.607421900 +0100 +@@ -14,7 +14,6 @@ + + #line __LINE__ "versioninfo.rc.in" + +-#include <afxres.h> + + + VS_VERSION_INFO VERSIONINFO diff --git a/external/gpgmepp/w32-build-fixes.patch.1 b/external/gpgmepp/w32-build-fixes.patch.1 new file mode 100644 index 000000000..9bc8f52b4 --- /dev/null +++ b/external/gpgmepp/w32-build-fixes.patch.1 @@ -0,0 +1,133 @@ +diff -ru gpgme.orig/m4/ax_cxx_compile_stdcxx.m4 gpgme/m4/ax_cxx_compile_stdcxx.m4 +--- gpgme.orig/m4/ax_cxx_compile_stdcxx.m4 2016-05-27 22:04:36.000000000 +0200 ++++ gpgme/m4/ax_cxx_compile_stdcxx.m4 2017-09-29 17:34:49.795243600 +0200 +@@ -156,7 +156,7 @@ + + #error "This is not a C++ compiler" + +-#elif __cplusplus < 201103L ++#elif __cplusplus < 201103L && !(defined _MSC_VER) + + #error "This is not a C++11 compiler" + +diff -ru gpgme.orig/src/dirinfo.c gpgme/src/dirinfo.c +--- gpgme.orig/src/dirinfo.c 2017-03-21 11:09:41.000000000 +0100 ++++ gpgme/src/dirinfo.c 2017-09-30 08:36:13.239279300 +0200 +@@ -33,6 +33,10 @@ + + DEFINE_STATIC_LOCK (dirinfo_lock); + ++#ifndef F_OK ++#define F_OK 0 ++#endif ++ + /* Constants used internally to select the data. */ + enum + { +diff -ru gpgme.orig/src/mbox-util.c gpgme/src/mbox-util.c +--- gpgme.orig/src/mbox-util.c 2016-11-16 13:22:41.000000000 +0100 ++++ gpgme/src/mbox-util.c 2017-09-30 08:18:29.270567500 +0200 +@@ -28,7 +28,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if HAVE_UNISTD_H + #include <unistd.h> ++#endif + #include <errno.h> + + #include "mbox-util.h" +diff -ru gpgme.orig/src/priv-io.h gpgme/src/priv-io.h +--- gpgme.orig/src/priv-io.h 2016-11-16 13:23:14.000000000 +0100 ++++ gpgme/src/priv-io.h 2017-09-30 08:20:38.770562400 +0200 +@@ -36,6 +36,9 @@ + #ifdef HAVE_SYS_TYPES_H + # include <sys/types.h> + #endif ++#if _MSC_VER ++typedef int pid_t; ++#endif + + + /* A single file descriptor passed to spawn. For child fds, dup_to +diff -ru gpgme.orig/src/util.h gpgme/src/util.h +--- gpgme.orig/src/util.h 2017-03-28 11:41:30.000000000 +0200 ++++ gpgme/src/util.h 2017-09-30 08:10:54.194049100 +0200 +@@ -39,6 +39,9 @@ + #ifdef HAVE_UNISTD_H + # include <unistd.h> + #endif ++#ifdef _MSC_VER ++typedef int pid_t; ++#endif + + #include "gpgme.h" + +diff -ru gpgme.orig/src/w32-util.c gpgme/src/w32-util.c +--- gpgme.orig/src/w32-util.c 2017-03-09 09:01:10.000000000 +0100 ++++ gpgme/src/w32-util.c 2017-09-30 08:32:02.114330500 +0200 +@@ -721,7 +721,8 @@ + v /= 62; + XXXXXX[5] = letters[v % 62]; + +- fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); ++ //fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); ++ fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL); + if (fd >= 0) + { + gpg_err_set_errno (save_errno); +diff -ru gpgme.orig/src/Makefile.am gpgme/src/Makefile.am +--- gpgme.orig/src/Makefile.am 2017-09-30 11:50:07.456960000 +0200 ++++ gpgme/src/Makefile.am 2017-09-30 11:51:29.609649400 +0200 +@@ -26,7 +26,7 @@ + m4data_DATA = gpgme.m4 + nodist_include_HEADERS = gpgme.h + +-bin_PROGRAMS = gpgme-tool ++bin_PROGRAMS = + + if BUILD_W32_GLIB + ltlib_gpgme_glib = libgpgme-glib.la +@@ -99,8 +99,8 @@ + # versions, because then every object file is only compiled once. + AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@ @GLIB_CFLAGS@ + +-gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h +-gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ ++gpgme_tool_SOURCES = ++gpgme_tool_LDADD = + + + if HAVE_W32_SYSTEM +@@ -120,7 +120,7 @@ + SUFFIXES = .rc .lo + + .rc.lo: +- $(LTRCCOMPILE) -i "$<" -o "$@" ++ $(LTRCCOMPILE) -i $< -o $@ + + gpgme_res = versioninfo.lo + no_undefined = -no-undefined +diff -ru gpgme.orig/src/vfs-mount.c gpgme/src/vfs-mount.c +--- gpgme.orig/src/vfs-mount.c 2017-03-09 09:01:10.000000000 +0100 ++++ gpgme/src/vfs-mount.c 2017-09-30 13:10:51.845807600 +0200 +@@ -68,7 +68,7 @@ + if (err) + return err; + +- if (! strcasecmp ("MOUNTPOINT", code)) ++ if (! _stricmp ("MOUNTPOINT", code)) + { + if (opd->result.mount_dir) + free (opd->result.mount_dir); +diff -ur gpgmepp.org/src/w32-glib-io.c gpgmepp/src/w32-glib-io.c +--- gpgmepp.org/src/w32-glib-io.c 2016-11-16 13:22:41.000000000 +0100 ++++ gpgmepp/src/w32-glib-io.c 2017-11-20 06:40:44.793945300 +0100 +@@ -37,6 +37,7 @@ + #ifdef HAVE_SYS_TYPES_H + # include <sys/types.h> + #endif ++#include <winsock2.h> + #include <glib.h> + #include <windows.h> + #include <io.h> diff --git a/external/gpgmepp/w32-disable-docs.patch.1 b/external/gpgmepp/w32-disable-docs.patch.1 new file mode 100644 index 000000000..603122131 --- /dev/null +++ b/external/gpgmepp/w32-disable-docs.patch.1 @@ -0,0 +1,15 @@ +Disable doc building the hard way - should rather be a config option +like libgpg-error's --disable-doc + +diff -ur gpgmepp.org/Makefile.am gpgmepp/Makefile.am +--- gpgmepp.org/Makefile.am 2016-11-16 13:20:18.000000000 +0100 ++++ gpgmepp/Makefile.am 2017-11-20 15:34:49.086731000 +0100 +@@ -33,7 +33,7 @@ + tests = + endif + +-SUBDIRS = src ${tests} doc lang ++SUBDIRS = src ${tests} lang + + # Fix the version of the spec file and create a file named VERSION + # to be used for patch's Prereq: feature. diff --git a/external/gpgmepp/w32-fix-libtool.patch.1 b/external/gpgmepp/w32-fix-libtool.patch.1 new file mode 100644 index 000000000..9a7adf713 --- /dev/null +++ b/external/gpgmepp/w32-fix-libtool.patch.1 @@ -0,0 +1,38 @@ +Gross hack to make libtool work with gcc-wrapper - frontended +link.exe on Windows. Make libtool ignore all libs & simply pass +them on as-is to the linker + +A proper fix would be to make gcc-wrapper behave like gcc during +linking, by accepting cygwin path names, and correctly expanding +-l<short_lib_name> to lib<short_lib_name>.lib + +diff -ur gpgmepp.org/m4/libtool.m4 gpgmepp/m4/libtool.m4 +--- gpgmepp.org/m4/libtool.m4 2016-11-16 13:20:16.000000000 +0100 ++++ gpgmepp/m4/libtool.m4 2017-11-21 22:00:05.006587800 +0100 +@@ -3209,24 +3209,11 @@ + ;; + + cygwin*) +- # func_win32_libid is a shell function defined in ltmain.sh +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='func_win32_libid' ++ lt_cv_deplibs_check_method=pass_all + ;; + + mingw* | pw32*) +- # Base MSYS/MinGW do not provide the 'file' command needed by +- # func_win32_libid shell function, so use a weaker test based on 'objdump', +- # unless we find 'file', for example because we are cross-compiling. +- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. +- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='func_win32_libid' +- else +- # Keep this pattern in sync with the one in func_win32_libid. +- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' +- lt_cv_file_magic_cmd='$OBJDUMP -f' +- fi ++ lt_cv_deplibs_check_method=pass_all + ;; + + cegcc*) diff --git a/external/gpgmepp/w32-fix-win32-macro.patch.1 b/external/gpgmepp/w32-fix-win32-macro.patch.1 new file mode 100644 index 000000000..70a8b5ffe --- /dev/null +++ b/external/gpgmepp/w32-fix-win32-macro.patch.1 @@ -0,0 +1,175 @@ +diff -ur gpgmepp.org/lang/cpp/src/callbacks.cpp gpgmepp/lang/cpp/src/callbacks.cpp +--- gpgmepp.org/lang/cpp/src/callbacks.cpp 2016-10-18 19:22:02.000000000 +0200 ++++ gpgmepp/lang/cpp/src/callbacks.cpp 2017-11-20 18:03:04.290060900 +0100 +@@ -38,7 +38,9 @@ + #include <cassert> + #include <cerrno> + #include <cstring> ++#if HAVE_UNISTD_H + #include <unistd.h> ++#endif + #include <stdlib.h> + + static inline gpgme_error_t make_err_from_syserror() +diff -ur gpgmepp.org/lang/cpp/src/data.h gpgmepp/lang/cpp/src/data.h +--- gpgmepp.org/lang/cpp/src/data.h 2017-03-24 15:20:32.000000000 +0100 ++++ gpgmepp/lang/cpp/src/data.h 2017-11-20 17:23:24.802711200 +0100 +@@ -31,6 +31,11 @@ + #include <algorithm> + #include <memory> + ++#ifdef _MSC_VER ++# include <BaseTsd.h> ++typedef SSIZE_T ssize_t; ++#endif ++ + namespace GpgME + { + +diff -ur gpgmepp.org/lang/cpp/src/editinteractor.cpp gpgmepp/lang/cpp/src/editinteractor.cpp +--- gpgmepp.org/lang/cpp/src/editinteractor.cpp 2017-03-09 09:01:10.000000000 +0100 ++++ gpgmepp/lang/cpp/src/editinteractor.cpp 2017-11-20 18:09:33.022674700 +0100 +@@ -30,9 +30,11 @@ + + #include <gpgme.h> + +-#ifdef _WIN32 ++#ifdef _MSC_VER + # include <io.h> +-#include <windows.h> ++# include <windows.h> ++# include <BaseTsd.h> ++ typedef SSIZE_T ssize_t; + #else + # include <unistd.h> + #endif +diff -ur gpgmepp.org/lang/cpp/src/gpgmepp_export.h gpgmepp/lang/cpp/src/gpgmepp_export.h +--- gpgmepp.org/lang/cpp/src/gpgmepp_export.h 2016-08-04 15:03:09.000000000 +0200 ++++ gpgmepp/lang/cpp/src/gpgmepp_export.h 2017-11-20 16:57:47.805691100 +0100 +@@ -29,14 +29,14 @@ + # ifndef GPGMEPP_EXPORT + # ifdef BUILDING_GPGMEPP + /* We are building this library */ +-# ifdef WIN32 ++# ifdef _MSC_VER + # define GPGMEPP_EXPORT __declspec(dllexport) + # else + # define GPGMEPP_EXPORT __attribute__((visibility("default"))) + # endif + # else + /* We are using this library */ +-# ifdef WIN32 ++# ifdef _MSC_VER + # define GPGMEPP_EXPORT __declspec(dllimport) + # else + # define GPGMEPP_EXPORT __attribute__((visibility("default"))) +@@ -45,7 +45,7 @@ + # endif + + # ifndef GPGMEPP_NO_EXPORT +-# ifdef WIN32 ++# ifdef _MSC_VER + # define GPGMEPP_NO_EXPORT + # else + # define GPGMEPP_NO_EXPORT __attribute__((visibility("hidden"))) +@@ -54,7 +54,11 @@ + #endif + + #ifndef GPGMEPP_DEPRECATED +-# define GPGMEPP_DEPRECATED __attribute__ ((__deprecated__)) ++# ifdef _MSC_VER ++# define GPGMEPP_DEPRECATED __declspec(deprecated("deprecated")) ++# else ++# define GPGMEPP_DEPRECATED __attribute__ ((__deprecated__)) ++# endif + #endif + + #ifndef GPGMEPP_DEPRECATED_EXPORT +diff -ur gpgmepp.org/lang/cpp/src/interfaces/dataprovider.h gpgmepp/lang/cpp/src/interfaces/dataprovider.h +--- gpgmepp.org/lang/cpp/src/interfaces/dataprovider.h 2016-05-17 14:32:37.000000000 +0200 ++++ gpgmepp/lang/cpp/src/interfaces/dataprovider.h 2017-11-20 18:03:11.332715700 +0100 +@@ -29,6 +29,11 @@ + + #include <gpg-error.h> + ++#ifdef _MSC_VER ++# include <BaseTsd.h> ++typedef SSIZE_T ssize_t; ++#endif ++ + namespace GpgME + { + +diff -ur gpgmepp.org/lang/cpp/src/key.cpp gpgmepp/lang/cpp/src/key.cpp +--- gpgmepp.org/lang/cpp/src/key.cpp 2017-03-20 20:10:15.000000000 +0100 ++++ gpgmepp/lang/cpp/src/key.cpp 2017-11-20 17:44:50.321858800 +0100 +@@ -33,10 +33,16 @@ + #include <gpgme.h> + + #include <string.h> ++#if HAVE_STRINGS_H + #include <strings.h> ++#endif + #include <istream> + #include <iterator> + ++#ifdef _MSC_VER ++# define strcasecmp _stricmp ++#endif ++ + const GpgME::Key::Null GpgME::Key::null; + + namespace GpgME +diff -ur gpgmepp.org/lang/cpp/src/key.h gpgmepp/lang/cpp/src/key.h +--- gpgmepp.org/lang/cpp/src/key.h 2017-03-20 20:10:15.000000000 +0100 ++++ gpgmepp/lang/cpp/src/key.h 2017-11-20 17:07:51.551632000 +0100 +@@ -30,7 +30,6 @@ + #include "gpgmefw.h" + + #include <memory> +-#include <sys/time.h> + + #include <vector> + #include <algorithm> +diff -ur gpgmepp.org/lang/qt/src/qgpgme_export.h gpgmepp/lang/qt/src/qgpgme_export.h +--- gpgmepp.org/lang/qt/src/qgpgme_export.h 2016-11-03 17:32:30.000000000 +0100 ++++ gpgmepp/lang/qt/src/qgpgme_export.h 2017-11-20 16:58:27.395388000 +0100 +@@ -39,14 +39,14 @@ + # ifndef QGPGME_EXPORT + # ifdef BUILDING_QGPGME + /* We are building this library */ +-# ifdef WIN32 ++# ifdef _WIN32 + # define QGPGME_EXPORT __declspec(dllexport) + # else + # define QGPGME_EXPORT __attribute__((visibility("default"))) + # endif + # else + /* We are using this library */ +-# ifdef WIN32 ++# ifdef _WIN32 + # define QGPGME_EXPORT __declspec(dllimport) + # else + # define QGPGME_EXPORT __attribute__((visibility("default"))) +@@ -55,7 +55,7 @@ + # endif + + # ifndef QGPGME_NO_EXPORT +-# ifdef WIN32 ++# ifdef _WIN32 + # define QGPGME_NO_EXPORT + # else + # define QGPGME_NO_EXPORT __attribute__((visibility("hidden"))) +@@ -64,7 +64,11 @@ + #endif + + #ifndef QGPGME_DEPRECATED +-# define QGPGME_DEPRECATED __attribute__ ((__deprecated__)) ++# ifdef _MSC_VER ++# define QGPGME_DEPRECATED __declspec(deprecated("deprecated")) ++# else ++# define QGPGME_DEPRECATED __attribute__ ((__deprecated__)) ++# endif + #endif + + #ifndef QGPGME_DEPRECATED_EXPORT diff --git a/external/graphite/Makefile b/external/graphite/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/graphite/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/graphite/Module_graphite.mk b/external/graphite/Module_graphite.mk new file mode 100644 index 000000000..ff981612b --- /dev/null +++ b/external/graphite/Module_graphite.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,graphite)) + +$(eval $(call gb_Module_add_targets,graphite,\ + StaticLibrary_graphite \ + UnpackedTarball_graphite \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/graphite/README b/external/graphite/README new file mode 100644 index 000000000..3174b7233 --- /dev/null +++ b/external/graphite/README @@ -0,0 +1,7 @@ +Library for providing rendering capabilities for complex non-Roman writing systems. + +From: +[http://graphite.sil.org/] + +Development: +[http://projects.palaso.org/projects/graphitedev] diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk new file mode 100644 index 000000000..ee233a10b --- /dev/null +++ b/external/graphite/StaticLibrary_graphite.mk @@ -0,0 +1,79 @@ +# -*- 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_StaticLibrary_StaticLibrary,graphite)) + +$(eval $(call gb_StaticLibrary_use_unpacked,graphite,graphite)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,graphite)) + +$(eval $(call gb_StaticLibrary_set_include,graphite,\ + -I$(call gb_UnpackedTarball_get_dir,graphite/include) \ + -I$(call gb_UnpackedTarball_get_dir,graphite/src) \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_defs,graphite,\ + -DGRAPHITE2_NTRACING \ + -DGRAPHITE2_STATIC \ +)) + +ifeq ($(COM),GCC) +ifneq ($(COM_IS_CLANG),TRUE) +$(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\ + -fpermissive \ +)) +endif +endif + +ifeq ($(OS),ANDROID) +# Force optimizations on Android, because otherwise Pass.cpp triggers an +# infinite loop in clang, at least in this version: +# Android (5058415 based on r339409) clang version 8.0.2 (https://android.googlesource.com/toolchain/clang 40173bab62ec746213857d083c0e8b0abb568790) (https://android.googlesource.com/toolchain/llvm 7a6618d69e7e8111e1d49dc9e7813767c5ca756a) (based on LLVM 8.0.2svn) +$(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\ + -Os \ +)) +endif + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,graphite,\ + UnpackedTarball/graphite/src/$(if $(filter GCC,$(COM)),direct,call)_machine \ + UnpackedTarball/graphite/src/gr_char_info \ + UnpackedTarball/graphite/src/gr_face \ + UnpackedTarball/graphite/src/gr_features \ + UnpackedTarball/graphite/src/gr_font \ + UnpackedTarball/graphite/src/gr_logging \ + UnpackedTarball/graphite/src/gr_segment \ + UnpackedTarball/graphite/src/gr_slot \ + UnpackedTarball/graphite/src/json \ + UnpackedTarball/graphite/src/CmapCache \ + UnpackedTarball/graphite/src/Code \ + UnpackedTarball/graphite/src/Collider \ + UnpackedTarball/graphite/src/Decompressor \ + UnpackedTarball/graphite/src/Face \ + UnpackedTarball/graphite/src/FeatureMap \ + UnpackedTarball/graphite/src/FileFace \ + UnpackedTarball/graphite/src/Font \ + UnpackedTarball/graphite/src/GlyphCache \ + UnpackedTarball/graphite/src/GlyphFace \ + UnpackedTarball/graphite/src/Intervals \ + UnpackedTarball/graphite/src/Justifier \ + UnpackedTarball/graphite/src/NameTable \ + UnpackedTarball/graphite/src/Pass \ + UnpackedTarball/graphite/src/Position \ + UnpackedTarball/graphite/src/Segment \ + UnpackedTarball/graphite/src/Silf \ + UnpackedTarball/graphite/src/Slot \ + UnpackedTarball/graphite/src/Sparse \ + UnpackedTarball/graphite/src/TtfUtil \ + UnpackedTarball/graphite/src/UtfCodec \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/graphite/UnpackedTarball_graphite.mk b/external/graphite/UnpackedTarball_graphite.mk new file mode 100644 index 000000000..464fcc256 --- /dev/null +++ b/external/graphite/UnpackedTarball_graphite.mk @@ -0,0 +1,20 @@ +# -*- 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,graphite)) + +$(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,graphite,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,graphite, \ + external/graphite/ubsan.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/graphite/ubsan.patch b/external/graphite/ubsan.patch new file mode 100644 index 000000000..fd7a08f82 --- /dev/null +++ b/external/graphite/ubsan.patch @@ -0,0 +1,11 @@ +--- src/gr_face.cpp ++++ src/gr_face.cpp +@@ -95,7 +95,7 @@ + + Face *res = new Face(appFaceHandle, *ops); + if (res && load_face(*res, faceOptions)) +- return static_cast<gr_face *>(res); ++ return reinterpret_cast<gr_face *>(res); + + delete res; + return 0; diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk new file mode 100644 index 000000000..7219d402d --- /dev/null +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -0,0 +1,59 @@ +# -*- 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,harfbuzz)) + +$(eval $(call gb_ExternalProject_use_autoconf,harfbuzz,build)) + +$(eval $(call gb_ExternalProject_register_targets,harfbuzz,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,harfbuzz,\ + icu \ + graphite \ +)) + +$(call gb_ExternalProject_get_state_target,harfbuzz,build) : + $(call gb_Trace_StartRange,harfbuzz,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(if $(CROSS_COMPILING),ICU_CONFIG=$(SRCDIR)/external/icu/cross-bin/icu-config) \ + $(if $(SYSTEM_ICU),,ICU_CONFIG=$(SRCDIR)/external/icu/cross-bin/icu-config) \ + GRAPHITE2_CFLAGS="$(GRAPHITE_CFLAGS)" \ + GRAPHITE2_LIBS="$(GRAPHITE_LIBS)" \ + ./configure \ + --enable-static \ + --disable-shared \ + --disable-gtk-doc \ + --with-pic \ + --with-icu=builtin \ + --with-freetype=no \ + --with-fontconfig=no \ + --with-cairo=no \ + --with-glib=no \ + --with-graphite2=yes \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(gb_FULLDEPS),,--disable-dependency-tracking) \ + --libdir=$(call gb_UnpackedTarball_get_dir,harfbuzz/src/.libs) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + CXXFLAGS=' \ + $(if $(filter ANDROID,$(OS)),-DHB_NO_MMAP=1,) \ + $(if $(call gb_Module__symbols_enabled,harfbuzz),$(gb_DEBUGINFO_FLAGS)) \ + $(if $(ENABLE_OPTIMIZED), \ + $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ + $(if $(ENABLE_RUNTIME_OPTIMIZATIONS),,-frtti) \ + $(CXXFLAGS) $(CXXFLAGS_CXX11) \ + $(ICU_UCHAR_TYPE) \ + $(if $(filter LINUX,$(OS)),-fvisibility=hidden)' \ + MAKE=$(MAKE) \ + && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \ + ) + $(call gb_Trace_EndRange,harfbuzz,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/harfbuzz/Makefile b/external/harfbuzz/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/harfbuzz/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/harfbuzz/Module_harfbuzz.mk b/external/harfbuzz/Module_harfbuzz.mk new file mode 100644 index 000000000..ffbadd710 --- /dev/null +++ b/external/harfbuzz/Module_harfbuzz.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,harfbuzz)) + +$(eval $(call gb_Module_add_targets,harfbuzz,\ + ExternalProject_harfbuzz \ + UnpackedTarball_harfbuzz \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/harfbuzz/README b/external/harfbuzz/README new file mode 100644 index 000000000..d2af8b559 --- /dev/null +++ b/external/harfbuzz/README @@ -0,0 +1 @@ +HarfBuzz is an OpenType text shaping engine. From [http://harfbuzz.org/]. diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk new file mode 100644 index 000000000..adec72ed0 --- /dev/null +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -0,0 +1,25 @@ +# -*- 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,harfbuzz)) + +$(eval $(call gb_UnpackedTarball_set_tarball,harfbuzz,$(HARFBUZZ_TARBALL),,harfbuzz)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,harfbuzz)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,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,harfbuzz, \ + external/harfbuzz/ubsan.patch \ + external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 b/external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 new file mode 100644 index 000000000..55344bc63 --- /dev/null +++ b/external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 @@ -0,0 +1,12 @@ +diff -ur harfbuzz.org/src/hb-icu.cc harfbuzz/src/hb-icu.cc +--- harfbuzz.org/src/hb-icu.cc 2019-06-26 22:30:55.000000000 +0200 ++++ harfbuzz/src/hb-icu.cc 2019-10-28 23:21:42.198460246 +0100 +@@ -53,7 +53,7 @@ + + /* ICU doesn't do-while(0) around their statements. Ugh! + * https://unicode-org.atlassian.net/browse/CLDR-13027 */ +-#define HB_ICU_STMT(S) do { S } while (0) ++#define HB_ICU_STMT(S) do { S; } while (0) + + hb_script_t + hb_icu_script_to_script (UScriptCode script) diff --git a/external/harfbuzz/ubsan.patch b/external/harfbuzz/ubsan.patch new file mode 100644 index 000000000..a9d1b72ef --- /dev/null +++ b/external/harfbuzz/ubsan.patch @@ -0,0 +1,20 @@ +--- src/hb-ot-layout-gsubgpos.hh ++++ src/hb-ot-layout-gsubgpos.hh +@@ -387,7 +387,7 @@ + skip == matcher_t::SKIP_NO)) + { + num_items--; +- match_glyph_data++; ++ if (match_glyph_data != nullptr) match_glyph_data++; + return true; + } + +@@ -414,7 +414,7 @@ + skip == matcher_t::SKIP_NO)) + { + num_items--; +- match_glyph_data++; ++ if (match_glyph_data != nullptr) match_glyph_data++; + return true; + } + diff --git a/external/hsqldb/ExternalPackage_hsqldb.mk b/external/hsqldb/ExternalPackage_hsqldb.mk new file mode 100644 index 000000000..e4dbb363b --- /dev/null +++ b/external/hsqldb/ExternalPackage_hsqldb.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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,hsqldb_project,hsqldb)) + +$(eval $(call gb_ExternalPackage_use_external_project,hsqldb_project,hsqldb)) + +$(eval $(call gb_ExternalPackage_add_file,hsqldb_project,$(LIBO_SHARE_JAVA_FOLDER)/hsqldb.jar,lib/hsqldb.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/hsqldb/ExternalProject_hsqldb.mk b/external/hsqldb/ExternalProject_hsqldb.mk new file mode 100644 index 000000000..d25333454 --- /dev/null +++ b/external/hsqldb/ExternalProject_hsqldb.mk @@ -0,0 +1,30 @@ +# -*- 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,hsqldb)) + +$(eval $(call gb_ExternalProject_register_targets,hsqldb,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,hsqldb,build) : + $(call gb_Trace_StartRange,hsqldb,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build/build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + $(if $(debug),-Dbuild.debug="on") \ + jar \ + ) + $(call gb_Trace_EndRange,hsqldb,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/hsqldb/Makefile b/external/hsqldb/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/hsqldb/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/hsqldb/Module_hsqldb.mk b/external/hsqldb/Module_hsqldb.mk new file mode 100644 index 000000000..d748faa2e --- /dev/null +++ b/external/hsqldb/Module_hsqldb.mk @@ -0,0 +1,18 @@ +# -*- 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,hsqldb)) + +$(eval $(call gb_Module_add_targets,hsqldb,\ + ExternalPackage_hsqldb \ + ExternalProject_hsqldb \ + UnpackedTarball_hsqldb \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/hsqldb/README b/external/hsqldb/README new file mode 100644 index 000000000..7d7f89f04 --- /dev/null +++ b/external/hsqldb/README @@ -0,0 +1,11 @@ +Java database engine from [http://hsqldb.org/]. + +Default database format for LibreOffice. + +At some point the plan was to replace it as default by Firebird, but +that seems increasingly unlikely to happen. + +See: +https://bugs.freedesktop.org/show_bug.cgi?id=51781 +http://www.firebirdsql.org + diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk new file mode 100644 index 000000000..cbba770f1 --- /dev/null +++ b/external/hsqldb/UnpackedTarball_hsqldb.mk @@ -0,0 +1,34 @@ +# -*- 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,hsqldb)) + +$(eval $(call gb_UnpackedTarball_set_tarball,hsqldb,$(HSQLDB_TARBALL),,hsqldb)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,hsqldb,\ + build/build.xml \ + src/org/hsqldb/Library.java \ + src/org/hsqldb/persist/HsqlDatabaseProperties.java \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\ + external/hsqldb/patches/i96823.patch \ + external/hsqldb/patches/i97032.patch \ + external/hsqldb/patches/i103528.patch \ + external/hsqldb/patches/i104901.patch \ + external/hsqldb/patches/fdo36824.patch \ + external/hsqldb/patches/limit_as_table_alias.patch \ + external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \ + $(if $(HSQLDB_USE_JDBC_4_1),\ + external/hsqldb/patches/jdbc-4.1.patch \ + external/hsqldb/patches/multipleResultSets.patch \ + ) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/hsqldb/patches/fdo36824.patch b/external/hsqldb/patches/fdo36824.patch new file mode 100644 index 000000000..ad753e335 --- /dev/null +++ b/external/hsqldb/patches/fdo36824.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/src/org/hsqldb/Expression.java 2012-07-03 19:49:00.000000000 +0200 ++++ misc/build/hsqldb/src/org/hsqldb/Expression.java 2012-07-03 19:39:00.000000000 +0200 +@@ -1552,7 +1552,7 @@ + return columnQuoted; + } + +- return false; ++ return true; + } + + /** diff --git a/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch b/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch new file mode 100644 index 000000000..214dc2c2b --- /dev/null +++ b/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch @@ -0,0 +1,14 @@ +--- misc/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java 2008-03-16 23:51:35.000000000 +0100 ++++ misc/build/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java 2018-07-12 11:46:57.997837180 +0200 +@@ -160,8 +160,9 @@ + public static void runFinalizers() { + + //#ifdef JAVA2FULL +- System.runFinalizersOnExit(true); +- ++ try { ++ System.class.getMethod("runFinalizersOnExit", boolean.class).invoke(null, true); ++ } catch (Exception e) {} + //#endif + } + diff --git a/external/hsqldb/patches/i103528.patch b/external/hsqldb/patches/i103528.patch new file mode 100644 index 000000000..3cc7d2f1d --- /dev/null +++ b/external/hsqldb/patches/i103528.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/src/org/hsqldb/Library.java ++++ misc/build/hsqldb/src/org/hsqldb/Library.java +@@ -1957,7 +1957,7 @@ + functionMap.put("bitand", bitand); + functionMap.put("bitlength", bitLength); + functionMap.put("bitor", bitor); +- functionMap.put("bitxor", bitor); ++ functionMap.put("bitxor", bitxor); + functionMap.put("character", character); + functionMap.put("concat", concat); + functionMap.put("cot", cot); diff --git a/external/hsqldb/patches/i104901.patch b/external/hsqldb/patches/i104901.patch new file mode 100644 index 000000000..a38773f4b --- /dev/null +++ b/external/hsqldb/patches/i104901.patch @@ -0,0 +1,27 @@ +--- misc/hsqldb/src/org/hsqldb/Table.java 2007-10-19 23:59:07.000000000 +0200 ++++ misc/build/hsqldb/src/org/hsqldb/Table.java 2009-09-11 13:45:42.939231519 +0200 +@@ -149,10 +149,10 @@ + Constraint[] constraintList; // constrainst for the table + HsqlArrayList[] triggerLists; // array of trigger lists + private int[] colTypes; // fredt - types of columns +- private int[] colSizes; // fredt - copy of SIZE values for columns ++ int[] colSizes; // fredt - copy of SIZE values for columns + private int[] colScales; // fredt - copy of SCALE values for columns + private boolean[] colNullable; // fredt - modified copy of isNullable() values +- private Expression[] colDefaults; // fredt - expressions of DEFAULT values ++ Expression[] colDefaults; // fredt - expressions of DEFAULT values + private int[] defaultColumnMap; // fred - holding 0,1,2,3,... + private boolean hasDefaultValues; //fredt - shortcut for above + boolean sqlEnforceSize; // inherited from the database - +--- misc/hsqldb/src/org/hsqldb/TableWorks.java 2007-01-14 06:48:16.000000000 +0100 ++++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java 2009-09-11 13:47:50.328667463 +0200 +@@ -670,7 +670,8 @@ + // default expressions can change + oldCol.setType(newCol); + oldCol.setDefaultExpression(newCol.getDefaultExpression()); +- table.setColumnTypeVars(colIndex); ++ table.colSizes[colIndex] = oldCol.getSize(); ++ table.colDefaults[colIndex] = oldCol.getDefaultExpression(); + table.resetDefaultsFlag(); + + return; diff --git a/external/hsqldb/patches/i96823.patch b/external/hsqldb/patches/i96823.patch new file mode 100644 index 000000000..bea4a2b7e --- /dev/null +++ b/external/hsqldb/patches/i96823.patch @@ -0,0 +1,94 @@ +--- misc/hsqldb/src/org/hsqldb/Expression.java 2008-05-27 17:15:05.000000000 +0200 ++++ misc/build/hsqldb/src/org/hsqldb/Expression.java 2009-01-27 11:42:16.890625000 +0100 +@@ -803,61 +803,62 @@ + + case EXISTS : + buf.append(' ').append(Token.T_EXISTS).append(' '); +- break; ++ ++ return buf.toString(); + + case COUNT : + buf.append(' ').append(Token.T_COUNT).append('('); +- break; ++ if ( "(*)".equals(left))buf.append('*');else buf.append(left); buf.append(')'); return buf.toString(); + + case SUM : + buf.append(' ').append(Token.T_SUM).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case MIN : + buf.append(' ').append(Token.T_MIN).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case MAX : + buf.append(' ').append(Token.T_MAX).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case AVG : + buf.append(' ').append(Token.T_AVG).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case EVERY : + buf.append(' ').append(Token.T_EVERY).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case SOME : + buf.append(' ').append(Token.T_SOME).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case STDDEV_POP : + buf.append(' ').append(Token.T_STDDEV_POP).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case STDDEV_SAMP : + buf.append(' ').append(Token.T_STDDEV_SAMP).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case VAR_POP : + buf.append(' ').append(Token.T_VAR_POP).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + + case VAR_SAMP : + buf.append(' ').append(Token.T_VAR_SAMP).append('('); + buf.append(left).append(')'); +- break; ++ return buf.toString(); + } + + throw Trace.error(Trace.EXPRESSION_NOT_SUPPORTED); +@@ -1522,6 +1523,16 @@ + if (exprType == COLUMN) { + return columnName; + } ++ if ( isAggregate(exprType) ) ++ { ++ try ++ { ++ return getDDL(); ++ } ++ catch(Exception e) ++ { ++ } ++ } + + return ""; + } diff --git a/external/hsqldb/patches/i97032.patch b/external/hsqldb/patches/i97032.patch new file mode 100644 index 000000000..9703b8961 --- /dev/null +++ b/external/hsqldb/patches/i97032.patch @@ -0,0 +1,10 @@ +--- misc/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2008-03-17 17:05:41.000000000 +0100 ++++ misc/build/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2009-01-21 13:09:24.493470142 +0100 +@@ -429,6 +429,7 @@ + setProperty(hsqldb_log_size, 10); + setProperty(sql_enforce_strict_size, true); + setProperty(hsqldb_nio_data_file, false); ++ setProperty(hsqldb_lock_file, true); + } + + // OOo end diff --git a/external/hsqldb/patches/jdbc-4.1.patch b/external/hsqldb/patches/jdbc-4.1.patch new file mode 100644 index 000000000..7884148c5 --- /dev/null +++ b/external/hsqldb/patches/jdbc-4.1.patch @@ -0,0 +1,320 @@ +--- misc/hsqldb/build/build.xml 2012-07-12 10:58:11.000000000 +0200 ++++ misc/build/hsqldb/build/build.xml 2012-07-12 10:49:28.000000000 +0200 +@@ -98,16 +98,24 @@ + <echo message="ant.java.hasjsse=${ant.java.hasjsse}" /> + </target> + +- <target name="javaversion6"> ++ <target name="javaversion7" unless="ant.java.iscjavaset"> ++ <available classname="java.util.Objects" property="ant.java.iscjava17"/> ++ <available classname="java.util.Objects" property="ant.java.iscjavaset"/> ++ </target> ++ ++ <target name="javaversion6" depends="javaversion7" unless="ant.java.iscjavaset"> + <available classname="java.net.IDN" property="ant.java.iscjava16"/> ++ <available classname="java.net.IDN" property="ant.java.iscjavaset"/> + </target> + +- <target name="javaversion4" depends="javaversion6" unless="ant.java.iscjava16"> ++ <target name="javaversion4" depends="javaversion6" unless="ant.java.iscjavaset"> + <available classname="java.nio.Buffer" property="ant.java.iscjava14"/> ++ <available classname="java.nio.Buffer" property="ant.java.iscjavaset"/> + </target> + +- <target name="javaversion2" depends="javaversion4" unless="ant.java.iscjava14"> ++ <target name="javaversion2" depends="javaversion4" unless="ant.java.iscjavaset"> + <available classname="java.lang.ref.Reference" property="ant.java.iscjava12"/> ++ <available classname="java.lang.ref.Reference" property="ant.java.iscjavaset"/> + </target> + + <target name="-prepare" depends="init,javaversion2"> +@@ -166,6 +177,7 @@ + <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > + <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> + <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> ++ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> + <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/> + <arg file="${src}/org/hsqldb/persist/LockFile.java"/> + <arg file="${src}/org/hsqldb/persist/Logger.java"/> +@@ -183,6 +195,7 @@ + <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > + <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> + <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> ++ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> + <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/> + <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/> + <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/> +@@ -210,6 +223,7 @@ + <arg value="+JAVA2FULL"/> + <arg value="-JAVA4"/> + <arg value="-JAVA6"/> ++ <arg value="-JAVA7"/> + </java> + </target> + +@@ -218,6 +232,7 @@ + <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > + <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> + <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> ++ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> + <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/> + <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/> + <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/> +@@ -244,6 +259,7 @@ + <arg value="+JAVA2FULL"/> + <arg value="+JAVA4"/> + <arg value="-JAVA6"/> ++ <arg value="-JAVA7"/> + </java> + </target> + +@@ -253,6 +269,43 @@ + <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > + <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> + <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> ++ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcCallableStatement.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcClob.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcConnection.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSet.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java"/> ++ <arg file="${src}/org/hsqldb/jdbc/jdbcStatement.java"/> ++ <arg file="${src}/org/hsqldb/persist/LockFile.java"/> ++ <arg file="${src}/org/hsqldb/persist/Logger.java"/> ++ <arg file="${src}/org/hsqldb/persist/ScaledRAFile.java"/> ++ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/> ++ <arg file="${src}/org/hsqldb/util/DatabaseManager.java"/> ++ <arg file="${src}/org/hsqldb/util/ConnectionDialogCommon.java"/> ++ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/> ++ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/> ++ <arg file="${src}/org/hsqldb/lib/SimpleLog.java"/> ++ <arg file="${src}/org/hsqldb/rowio/RowInputTextLog.java"/> ++ <arg file="${src}/org/hsqldb/HsqlDateTime.java"/> ++ <arg value="+JAVA2"/> ++ <arg value="+JAVA2FULL"/> ++ <arg value="+JAVA4"/> ++ <arg value="+JAVA6"/> ++ <arg value="-JAVA7"/> ++ </java> ++ </target> ++ ++ <target name="switchtojdk17" depends="switchtojdk16" ++ description="self explanatory" if="ant.java.iscjava17"> ++ <java classname="org.hsqldb.util.CodeSwitcher" classpath="classes" > ++ <arg file="${src}/org/hsqldb/lib/java/JavaSystem.java"/> ++ <arg file="${src}/org/hsqldb/lib/HsqlTimer.java"/> ++ <arg file="${src}/org/hsqldb/jdbcDriver.java"/> + <arg file="${src}/org/hsqldb/jdbc/jdbcBlob.java"/> + <arg file="${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java"/> + <arg file="${src}/org/hsqldb/jdbc/jdbcDataSource.java"/> +@@ -279,10 +332,11 @@ + <arg value="+JAVA2FULL"/> + <arg value="+JAVA4"/> + <arg value="+JAVA6"/> ++ <arg value="+JAVA7"/> + </java> + </target> + +- <target name="store" depends="switchtojdk16" ++ <target name="store" depends="switchtojdk17" + description="compiles the /store folder"> + <javac srcdir="${src}" + destdir="classes" +--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-02-08 15:14:42.802123563 +0000 ++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-02-08 15:47:35.842635642 +0000 +@@ -3375,4 +3375,18 @@ + */ + + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public <T> T getObject(int ColumnIndex, Class<T> type) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ ++//#endif JAVA7 + } +--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:14:42.802123563 +0000 ++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:47:35.851635628 +0000 +@@ -48,6 +48,12 @@ + */ + + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++import java.util.concurrent.Executor; ++ ++//#endif JAVA7 ++ + import java.sql.PreparedStatement; + import java.sql.SQLException; + import java.sql.SQLWarning; +@@ -2793,4 +2799,31 @@ + */ + + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++ public int getNetworkTimeout() throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public void setNetworkTimeout(Executor executor, int millis) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public void abort(Executor executor) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public String getSchema() throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public void setSchema(String schema) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++//#endif JAVA7 + } +--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:14:42.802123563 +0000 ++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:47:35.835635654 +0000 +@@ -5693,4 +5693,21 @@ + */ + + //#endif JAVA6 ++ ++ ++//#ifdef JAVA7 ++ public boolean generatedKeyAlwaysReturned() throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public ResultSet getPseudoColumns(String catalog, String schemaPattern, ++ String tableNamePattern, String columnNamePattern) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ ++//#endif JAVA7 ++ + } +--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-02-08 15:14:42.802123563 +0000 ++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-02-08 15:47:35.836635653 +0000 +@@ -47,6 +47,11 @@ + //#endif JAVA4 + import org.hsqldb.jdbcDriver; + ++//#ifdef JAVA7 ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; ++//#endif JAVA7 ++ + // boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final + + /** +@@ -323,4 +328,15 @@ + */ + + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException ++ { ++ throw new AbstractMethodError( ++ "org.hsqldb.jdbc.jdbcDataSource.getParentLogger should throw" + ++ " SQLFeatureNotSupportedException, but that is not yet available" + ++ " in Java 5"); ++ } ++ ++//#endif JAVA7 + } +--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:14:42.802123563 +0000 ++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:47:35.866635606 +0000 +@@ -5324,4 +5324,19 @@ + */ + + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++ ++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public <T> T getObject(int columnNum, Class<T> type) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++//#endif JAVA7 ++ + } +--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:14:42.802123563 +0000 ++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:47:35.872635595 +0000 +@@ -1608,4 +1608,16 @@ + } + */ + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++ public boolean isCloseOnCompletion() throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public void closeOnCompletion() throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++//#endif JAVA7 + } +--- misc/hsqldb/src/org/hsqldb/jdbcDriver.java 2012-02-08 15:14:42.800123566 +0000 ++++ misc/build/hsqldb/src/org/hsqldb/jdbcDriver.java 2012-02-08 15:47:35.826635667 +0000 +@@ -42,6 +42,11 @@ + import org.hsqldb.persist.HsqlDatabaseProperties; + import org.hsqldb.persist.HsqlProperties; + ++//#ifdef JAVA7 ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; ++//#endif JAVA7 ++ + // fredt@users 20011220 - patch 1.7.0 by fredt + // new version numbering scheme + // fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping +@@ -321,4 +326,15 @@ + DriverManager.registerDriver(new jdbcDriver()); + } catch (Exception e) {} + } ++ ++//#ifdef JAVA7 ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException ++ { ++ throw new AbstractMethodError( ++ "org.hsqldb.jdbcDriver.getParentLogger should throw" + ++ " SQLFeatureNotSupportedException, but that is not yet available" + ++ " in Java 5"); ++ } ++ ++//#endif JAVA7 + } diff --git a/external/hsqldb/patches/limit_as_table_alias.patch b/external/hsqldb/patches/limit_as_table_alias.patch new file mode 100644 index 000000000..09f49ccd5 --- /dev/null +++ b/external/hsqldb/patches/limit_as_table_alias.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/src/org/hsqldb/Token.java 2013-06-13 10:04:28.975934479 +0200 ++++ misc/build/hsqldb/src/org/hsqldb/Token.java 2013-06-13 10:06:09.915931966 +0200 +@@ -819,7 +819,7 @@ + Token.T_EXTRACT, Token.T_FOR, Token.T_FROM, Token.T_GROUP, + Token.T_HAVING, Token.T_IF, Token.T_INTO, Token.T_IFNULL, + Token.T_IS, Token.T_IN, Token.T_INTERSECT, Token.T_JOIN, +- Token.T_INNER, Token.T_LEADING, Token.T_LIKE, Token.T_MAX, ++ Token.T_INNER, Token.T_LEADING, Token.T_LIKE, Token.T_LIMIT, Token.T_MAX, + Token.T_MIN, Token.T_NEXT, Token.T_NULLIF, Token.T_NOT, + Token.T_NVL, Token.T_MINUS, Token.T_ON, Token.T_ORDER, Token.T_OR, + Token.T_OUTER, Token.T_POSITION, Token.T_PRIMARY, Token.T_SELECT, diff --git a/external/hsqldb/patches/multipleResultSets.patch b/external/hsqldb/patches/multipleResultSets.patch new file mode 100644 index 000000000..56ddb13b4 --- /dev/null +++ b/external/hsqldb/patches/multipleResultSets.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:14:42.802123563 +0000 ++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:47:35.835635654 +0000 +@@ -1347,7 +1347,7 @@ + * @exception SQLException if a database access error occurs + */ + public boolean supportsMultipleResultSets() throws SQLException { +- return false; ++ return true; + } + + /** diff --git a/external/hunspell/0001-invalid-read-memory-access-624.patch b/external/hunspell/0001-invalid-read-memory-access-624.patch new file mode 100644 index 000000000..66b55e755 --- /dev/null +++ b/external/hunspell/0001-invalid-read-memory-access-624.patch @@ -0,0 +1,25 @@ +From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Tue, 12 Nov 2019 20:03:15 +0000 +Subject: [PATCH] invalid read memory access #624 + +--- + src/hunspell/suggestmgr.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx +index dba084e..c23f165 100644 +--- a/src/hunspell/suggestmgr.cxx ++++ b/src/hunspell/suggestmgr.cxx +@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring( + int l2 = su2.size(); + // decapitalize dictionary word + if (complexprefixes) { +- if (su1[l1 - 1] == su2[l2 - 1]) ++ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1]) + return 1; + } else { + unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l; +-- +2.23.0 + diff --git a/external/hunspell/ExternalProject_hunspell.mk b/external/hunspell/ExternalProject_hunspell.mk new file mode 100644 index 000000000..43da1c254 --- /dev/null +++ b/external/hunspell/ExternalProject_hunspell.mk @@ -0,0 +1,36 @@ +# -*- 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,hunspell)) + +$(eval $(call gb_ExternalProject_register_targets,hunspell,\ + build \ +)) + +hunspell_CPPCLAGS=$(CPPFLAGS) + +ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS))) +ifneq (,$(gb_ENABLE_DBGUTIL)) +hunspell_CPPFLAGS+=-D_GLIBCXX_DEBUG +endif +endif + +$(call gb_ExternalProject_get_state_target,hunspell,build): + $(call gb_Trace_StartRange,hunspell,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure --disable-shared --disable-nls --with-pic \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ + $(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \ + $(if $(hunspell_CPPFLAGS),CPPFLAGS='$(hunspell_CPPFLAGS)') \ + CXXFLAGS="$(CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS))" \ + && cd src/hunspell && $(MAKE) \ + ) + $(call gb_Trace_EndRange,hunspell,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/hunspell/Makefile b/external/hunspell/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/hunspell/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/hunspell/Module_hunspell.mk b/external/hunspell/Module_hunspell.mk new file mode 100644 index 000000000..505a9fb0c --- /dev/null +++ b/external/hunspell/Module_hunspell.mk @@ -0,0 +1,25 @@ +# -*- 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,hunspell)) + +$(eval $(call gb_Module_add_targets,hunspell,\ + UnpackedTarball_hunspell \ +)) +ifeq ($(COM),MSC) +$(eval $(call gb_Module_add_targets,hunspell,\ + StaticLibrary_hunspell \ +)) +else +$(eval $(call gb_Module_add_targets,hunspell,\ + ExternalProject_hunspell \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/hunspell/README b/external/hunspell/README new file mode 100644 index 000000000..1221735ca --- /dev/null +++ b/external/hunspell/README @@ -0,0 +1,4 @@ +Library for spell checking. + +From: +[http://hunspell.sourceforge.net/]. diff --git a/external/hunspell/StaticLibrary_hunspell.mk b/external/hunspell/StaticLibrary_hunspell.mk new file mode 100644 index 000000000..02d534f69 --- /dev/null +++ b/external/hunspell/StaticLibrary_hunspell.mk @@ -0,0 +1,36 @@ +# -*- 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_StaticLibrary_StaticLibrary,hunspell)) + +$(eval $(call gb_StaticLibrary_use_unpacked,hunspell,hunspell)) + +$(eval $(call gb_StaticLibrary_use_external,hunspell,icu_headers)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,hunspell)) + +$(eval $(call gb_StaticLibrary_add_defs,hunspell,\ + -DHUNSPELL_STATIC \ + -DOPENOFFICEORG \ +)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,hunspell,\ + UnpackedTarball/hunspell/src/hunspell/affentry \ + UnpackedTarball/hunspell/src/hunspell/affixmgr \ + UnpackedTarball/hunspell/src/hunspell/csutil \ + UnpackedTarball/hunspell/src/hunspell/hashmgr \ + UnpackedTarball/hunspell/src/hunspell/suggestmgr \ + UnpackedTarball/hunspell/src/hunspell/phonet \ + UnpackedTarball/hunspell/src/hunspell/hunzip \ + UnpackedTarball/hunspell/src/hunspell/filemgr \ + UnpackedTarball/hunspell/src/hunspell/replist \ + UnpackedTarball/hunspell/src/hunspell/hunspell \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk new file mode 100644 index 000000000..1cd24e225 --- /dev/null +++ b/external/hunspell/UnpackedTarball_hunspell.mk @@ -0,0 +1,28 @@ + -*- 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,hunspell)) + +$(eval $(call gb_UnpackedTarball_set_tarball,hunspell,$(HUNSPELL_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,hunspell)) + +ifeq ($(COM),MSC) +$(eval $(call gb_UnpackedTarball_set_post_action,hunspell,\ + touch src/hunspell/config.h \ +)) +endif + +$(eval $(call gb_UnpackedTarball_set_patchlevel,hunspell,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,hunspell, \ + external/hunspell/0001-invalid-read-memory-access-624.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk new file mode 100644 index 000000000..21cef66d8 --- /dev/null +++ b/external/hyphen/ExternalProject_hyphen.mk @@ -0,0 +1,28 @@ +# -*- 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,hyphen)) + +$(eval $(call gb_ExternalProject_use_external,hyphen,hunspell)) + +$(eval $(call gb_ExternalProject_register_targets,hyphen,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,hyphen,build): + $(call gb_Trace_StartRange,hyphen,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure --disable-shared \ + $(if $(filter-out iOS,$(OS)),--with-pic) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,hyphen,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/hyphen/Makefile b/external/hyphen/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/hyphen/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/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk new file mode 100644 index 000000000..527def321 --- /dev/null +++ b/external/hyphen/Module_hyphen.mk @@ -0,0 +1,30 @@ +# -*- 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,hyphen)) + +$(eval $(call gb_Module_add_targets,hyphen,\ + UnpackedTarball_hyphen \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,hyphen,\ + StaticLibrary_hyphen \ +)) + +else + +$(eval $(call gb_Module_add_targets,hyphen,\ + ExternalProject_hyphen \ +)) + +endif # $(COM) + +# vim: set noet sw=4 ts=4: diff --git a/external/hyphen/README b/external/hyphen/README new file mode 100644 index 000000000..327b5b6e8 --- /dev/null +++ b/external/hyphen/README @@ -0,0 +1 @@ +Hyphenator library from [http://hunspell.sourceforge.net] diff --git a/external/hyphen/StaticLibrary_hyphen.mk b/external/hyphen/StaticLibrary_hyphen.mk new file mode 100644 index 000000000..e911feb9b --- /dev/null +++ b/external/hyphen/StaticLibrary_hyphen.mk @@ -0,0 +1,22 @@ +# -*- 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_StaticLibrary_StaticLibrary,hyphen)) + +$(eval $(call gb_StaticLibrary_use_unpacked,hyphen,hyphen)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,hyphen)) + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,hyphen,\ + UnpackedTarball/hyphen/hyphen \ + UnpackedTarball/hyphen/hnjalloc \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/external/hyphen/UnpackedTarball_hyphen.mk b/external/hyphen/UnpackedTarball_hyphen.mk new file mode 100644 index 000000000..c4bbb0226 --- /dev/null +++ b/external/hyphen/UnpackedTarball_hyphen.mk @@ -0,0 +1,21 @@ +# -*- 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,hyphen)) + +$(eval $(call gb_UnpackedTarball_set_tarball,hyphen,$(HYPHEN_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,hyphen)) + +$(eval $(call gb_UnpackedTarball_add_patches,hyphen,\ + external/hyphen/hyphen-build.patch \ + external/hyphen/hyphen-fdo48017-wfopen.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/hyphen/hyphen-build.patch b/external/hyphen/hyphen-build.patch new file mode 100644 index 000000000..6df2bb680 --- /dev/null +++ b/external/hyphen/hyphen-build.patch @@ -0,0 +1,38 @@ +--- misc/hyphen-2.8.4/Makefile.am 2010-07-19 11:23:17.000000000 +0200 ++++ misc/build/hyphen-2.8.4/Makefile.am 2010-12-02 10:15:44.390625000 +0100 +@@ -25,13 +25,13 @@ + + hyphen.us3: + cp -f $(srcdir)/hyphen.tex hyphen.us +- patch < $(srcdir)/hyphen.patch ++ $(GNUPATCH) < $(srcdir)/hyphen.patch + $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2 + cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3 + cat $(srcdir)/ligpatch.txt >>hyphen.us3 + +-hyph_en_US.dic: hyphen.us3 +- perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic UTF-8 2 3 >/dev/null ++hyph_en_US.dic: ++ @echo "hyph_en_US.txt distributed with Hyphen library" + + clean-local: + rm -rf hyphen.us* hyph_en_US.dic +--- misc/hyphen-2.8.4/Makefile.in 2010-12-01 02:31:29.000000000 +0100 ++++ misc/build/hyphen-2.8.4/Makefile.in 2010-12-02 10:17:16.546875000 +0100 +@@ -940,13 +940,13 @@ + + hyphen.us3: + cp -f $(srcdir)/hyphen.tex hyphen.us +- patch < $(srcdir)/hyphen.patch ++ $(GNUPATCH) < $(srcdir)/hyphen.patch + $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2 + cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3 + cat $(srcdir)/ligpatch.txt >>hyphen.us3 + +-hyph_en_US.dic: hyphen.us3 +- perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic UTF-8 2 3 >/dev/null ++hyph_en_US.dic: ++ @echo "hyph_en_US.txt distributed with Hyphen library" + + clean-local: + rm -rf hyphen.us* hyph_en_US.dic diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch b/external/hyphen/hyphen-fdo48017-wfopen.patch new file mode 100644 index 000000000..815eeda79 --- /dev/null +++ b/external/hyphen/hyphen-fdo48017-wfopen.patch @@ -0,0 +1,49 @@ +diff -u hyphen/hyphen.c build/hyphen/hyphen.c +--- hyphen/hyphen.c 2014-05-22 00:28:13.164587974 +0200 ++++ build/hyphen/hyphen.c 2015-05-22 11:08:55.000000000 +0200 +@@ -44,6 +44,11 @@ + #include <unistd.h> /* for exit */ + #endif + ++#ifdef _WIN32 ++#include <windows.h> ++#include <wchar.h> ++#endif ++ + #define noVERBOSE + + /* calculate hyphenmin values with long ligature length (2 or 3 characters +@@ -371,12 +376,32 @@ + } + } + ++FILE * hnj_fopen(const char * path, const char * mode) { ++#ifdef _WIN32 ++#define WIN32_LONG_PATH_PREFIX "\\\\?\\" ++ if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) { ++ int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0); ++ wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t)); ++ wchar_t *buff2 = (wchar_t *) malloc(len * sizeof(wchar_t)); ++ FILE * f = NULL; ++ MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len); ++ if (_wfullpath( buff2, buff, len ) != NULL) { ++ f = _wfopen(buff2, (strcmp(mode, "r") == 0) ? L"r" : L"rb"); ++ } ++ free(buff); ++ free(buff2); ++ return f; ++ } ++#endif ++ return fopen(path, mode); ++} ++ + HyphenDict * + hnj_hyphen_load (const char *fn) + { + HyphenDict *result; + FILE *f; +- f = fopen (fn, "r"); ++ f = hnj_fopen (fn, "r"); + if (f == NULL) + return NULL; + diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk new file mode 100644 index 000000000..dcd4da216 --- /dev/null +++ b/external/icu/ExternalPackage_icu.mk @@ -0,0 +1,42 @@ +# -*- 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/. +# + +icu_VERSION := $(ICU_MAJOR).$(ICU_MINOR)$(if $(ICU_MICRO),.$(ICU_MICRO)) + +$(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu)) + +$(eval $(call gb_ExternalPackage_use_external_project,icu,icu)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) +ifeq ($(OS),WNT) + +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_files,icu,$(LIBO_LIB_FOLDER),\ + source/lib/icuin$(ICU_MAJOR).dll \ +)) +else +$(eval $(call gb_ExternalPackage_add_files,icu,$(LIBO_LIB_FOLDER),\ + source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ +)) +endif # $(COM) + +else ifeq ($(OS),ANDROID) + +$(eval $(call gb_ExternalPackage_add_files,icu,$(LIBO_LIB_FOLDER),\ + source/lib/libicui18nlo.so \ +)) + +else # $(OS) != WNT/ANDROID + +$(eval $(call gb_ExternalPackage_add_file,icu,$(LIBO_LIB_FOLDER)/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) + +endif # $(OS) +endif # DISABLE_DYNLOADING + +# vim: set noet sw=4 ts=4: diff --git a/external/icu/ExternalPackage_icu_ure.mk b/external/icu/ExternalPackage_icu_ure.mk new file mode 100644 index 000000000..fefe71afd --- /dev/null +++ b/external/icu/ExternalPackage_icu_ure.mk @@ -0,0 +1,48 @@ +# -*- 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/. +# + +# libxml2 is in URE and depends on icuuc*.dll on Windows; the i18nlangtag lib is +# in URE and depends on the icuuc lib (which in turn depends on the icudata lib) +# on all platforms: + +$(eval $(call gb_ExternalPackage_ExternalPackage,icu_ure,icu)) + +$(eval $(call gb_ExternalPackage_use_external_project,icu_ure,icu)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) +ifeq ($(OS),WNT) + +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_files,icu_ure,$(LIBO_URE_LIB_FOLDER),\ + source/lib/icudt$(ICU_MAJOR).dll \ + source/lib/icuuc$(ICU_MAJOR).dll \ +)) +else +$(eval $(call gb_ExternalPackage_add_files,icu_ure,$(LIBO_URE_LIB_FOLDER),\ + source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ + source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ +)) +endif # $(COM) + +else ifeq ($(OS),ANDROID) + +$(eval $(call gb_ExternalPackage_add_files,icu_ure,$(LIBO_URE_LIB_FOLDER),\ + source/lib/libicudatalo.so \ + source/lib/libicuuclo.so \ +)) + +else # $(OS) != WNT/ANDROID + +$(eval $(call gb_ExternalPackage_add_file,icu_ure,$(LIBO_URE_LIB_FOLDER)/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION))) +$(eval $(call gb_ExternalPackage_add_file,icu_ure,$(LIBO_URE_LIB_FOLDER)/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION))) + +endif # $(OS) +endif # DISABLE_DYNLOADING + +# vim: set noet sw=4 ts=4: diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk new file mode 100644 index 000000000..f62d8528c --- /dev/null +++ b/external/icu/ExternalProject_icu.mk @@ -0,0 +1,94 @@ +# -*- 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,icu)) + +$(eval $(call gb_ExternalProject_register_targets,icu,\ + build \ +)) + +icu_CPPFLAGS:="-DHAVE_GCC_ATOMICS=$(if $(filter TRUE,$(GCC_HAVE_BUILTIN_ATOMIC)),1,0)" + +ifeq ($(OS),WNT) + +# Note: runConfigureICU ignores everything following the platform name! +$(call gb_ExternalProject_get_state_target,icu,build) : + $(call gb_Trace_StartRange,icu,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export LIB="$(ILIB)" \ + && CFLAGS="-FS $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="-FS $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" \ + INSTALL=`cygpath -m /usr/bin/install` \ + ./runConfigureICU \ + $(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug --disable-release) \ + Cygwin/MSVC --disable-extras \ + && $(MAKE) \ + ,source) + $(call gb_Trace_EndRange,icu,EXTERNAL) + +else # $(OS) + +icu_CFLAGS:=" \ + $(if $(filter iOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ + $(if $(SYSBASE),-I$(SYSBASE)/usr/include) \ + $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ + $(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \ + $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \ + $(if $(call gb_Module__symbols_enabled,icu),$(gb_DEBUGINFO_FLAGS)) \ + $(if $(filter FUZZERS,$(BUILD_TYPE)),-DU_USE_STRTOD_L=0) \ + $(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer)" +icu_CXXFLAGS:="$(CXXFLAGS) $(CXXFLAGS_CXX11) \ + $(if $(filter iOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ + $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ + $(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \ + $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \ + $(if $(call gb_Module__symbols_enabled,icu),$(gb_DEBUGINFO_FLAGS)) \ + $(if $(filter FUZZERS,$(BUILD_TYPE)),-DU_USE_STRTOD_L=0) \ + $(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer $(SOLARINC))" +icu_LDFLAGS:=" \ + $(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \ + $(if $(filter TRUE,$(HAVE_LD_HASH_STYLE)),-Wl$(COMMA)--hash-style=$(WITH_LINKER_HASH_STYLE)) \ + $(if $(SYSBASE),-L../lib -L../../lib -L../stubdata -L../../stubdata -L$(SYSBASE)/usr/lib) \ + $(if $(filter TRUE,$(HAVE_LD_BSYMBOLIC_FUNCTIONS)), -Wl$(COMMA)-Bsymbolic-functions) \ + $(if $(filter ANDROID,$(OS)),$(gb_STDLIBS))" + +# DATASUBDIR=data in cross-compiling case, because --disable-tools completely skips the +# data directory/doesn't build the requested library in that case (icu/source/Makefile.in) +# so we need to add it back to the list of subdirectories to build +$(call gb_ExternalProject_get_state_target,icu,build) : + $(call gb_Trace_StartRange,icu,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \ + CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \ + ./configure \ + --disable-layout --disable-samples \ + $(if $(filter FUZZERS,$(BUILD_TYPE)),--disable-release) \ + $(if $(CROSS_COMPILING),--disable-tools --disable-extras) \ + $(if $(filter iOS ANDROID,$(OS)),--disable-dyload) \ + $(if $(filter ANDROID,$(OS)),--disable-strict ac_cv_c_bigendian=no) \ + $(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),\ + --with-data-packaging=static --enable-static --disable-shared --disable-dyload,\ + --disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\ + --with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \ + && $(MAKE) $(if $(CROSS_COMPILING),DATASUBDIR=data) \ + $(if $(filter MACOSX,$(OS)), \ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \ + URELIB \ + $(EXTERNAL_WORKDIR)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \ + $(EXTERNAL_WORKDIR)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION) \ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \ + OOO \ + $(EXTERNAL_WORKDIR)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)) \ + ,source) + $(call gb_Trace_EndRange,icu,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/icu/Makefile b/external/icu/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/icu/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/icu/Module_icu.mk b/external/icu/Module_icu.mk new file mode 100644 index 000000000..5c99b930f --- /dev/null +++ b/external/icu/Module_icu.mk @@ -0,0 +1,19 @@ +# -*- 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,icu)) + +$(eval $(call gb_Module_add_targets,icu,\ + UnpackedTarball_icu \ + ExternalPackage_icu \ + ExternalPackage_icu_ure \ + ExternalProject_icu \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/icu/README b/external/icu/README new file mode 100644 index 000000000..484de1f41 --- /dev/null +++ b/external/icu/README @@ -0,0 +1 @@ +Library providing Unicode support, from [http://site.icu-project.org/]. diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk new file mode 100644 index 000000000..72fae09b1 --- /dev/null +++ b/external/icu/UnpackedTarball_icu.mk @@ -0,0 +1,46 @@ +# -*- 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,icu)) + +$(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,icu,source)) + +# Data zip contains data/... and needs to end up in icu/source/data/... +# Only data/misc/icudata.rc is needed for a Cygwin/MSVC build. +$(eval $(call gb_UnpackedTarball_set_pre_action,icu,\ + unzip -q -d source -o $(gb_UnpackedTarget_TARFILE_LOCATION)/$(ICU_DATA_TARBALL) data/misc/icudata.rc \ +)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,icu,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,icu,\ + external/icu/icu4c-build.patch.1 \ + external/icu/icu4c-aix.patch.1 \ + external/icu/icu4c-warnings.patch.1 \ + external/icu/icu4c-macosx.patch.1 \ + external/icu/icu4c-solarisgcc.patch.1 \ + external/icu/icu4c-mkdir.patch.1 \ + external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \ + external/icu/icu4c-ubsan.patch.1 \ + external/icu/icu4c-scriptrun.patch.1 \ + external/icu/icu4c-rtti.patch.1 \ + external/icu/icu4c-clang-cl.patch.1 \ + $(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \ + external/icu/gcc9.patch \ + external/icu/c++20-comparison.patch \ + external/icu/ubsan.patch \ + external/icu/Wdeprecated-copy-dtor.patch \ + external/icu/icu4c-khmerbreakengine.patch.1 \ +)) + +$(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict)) + +# vim: set noet sw=4 ts=4: diff --git a/external/icu/Wdeprecated-copy-dtor.patch b/external/icu/Wdeprecated-copy-dtor.patch new file mode 100644 index 000000000..67078ef1b --- /dev/null +++ b/external/icu/Wdeprecated-copy-dtor.patch @@ -0,0 +1,25 @@ +--- source/common/unicode/uobject.h ++++ source/common/unicode/uobject.h +@@ -245,10 +245,10 @@ + // direct use of UObject itself + + // default constructor +- // inline UObject() {} ++ UObject() = default; + + // copy constructor +- // inline UObject(const UObject &other) {} ++ UObject(const UObject &other) = default; + + #if 0 + // TODO Sometime in the future. Implement operator==(). +@@ -280,8 +280,8 @@ + * Subclasses need this assignment operator if they use compiler-provided + * assignment operators of their own. An alternative to not declaring one + * here would be to declare and empty-implement a protected or public one. +- UObject &UObject::operator=(const UObject &); + */ ++ UObject &operator=(const UObject &) = default; + }; + + #ifndef U_HIDE_INTERNAL_API diff --git a/external/icu/c++20-comparison.patch b/external/icu/c++20-comparison.patch new file mode 100644 index 000000000..44053e671 --- /dev/null +++ b/external/icu/c++20-comparison.patch @@ -0,0 +1,171 @@ +--- source/common/uvector.cpp ++++ source/common/uvector.cpp +@@ -110,7 +110,7 @@ + } + + // This only does something sensible if this object has a non-null comparer +-UBool UVector::operator==(const UVector& other) { ++UBool UVector::operator==(const UVector& other) const { + int32_t i; + if (count != other.count) return FALSE; + if (comparer != NULL) { +--- source/common/uvector.h ++++ source/common/uvector.h +@@ -113,12 +113,12 @@ + * equal if they are of the same size and all elements are equal, + * as compared using this object's comparer. + */ +- UBool operator==(const UVector& other); ++ UBool operator==(const UVector& other) const; + + /** + * Equivalent to !operator==() + */ +- inline UBool operator!=(const UVector& other); ++ inline UBool operator!=(const UVector& other) const; + + //------------------------------------------------------------ + // java.util.Vector API +@@ -382,7 +382,7 @@ + return elementAt(index); + } + +-inline UBool UVector::operator!=(const UVector& other) { ++inline UBool UVector::operator!=(const UVector& other) const { + return !operator==(other); + } + +--- source/i18n/tzrule.cpp ++++ source/i18n/tzrule.cpp +@@ -53,7 +53,7 @@ + return *this; + } + +-UBool ++bool + TimeZoneRule::operator==(const TimeZoneRule& that) const { + return ((this == &that) || + (typeid(*this) == typeid(that) && +@@ -120,7 +120,7 @@ + return *this; + } + +-UBool ++bool + InitialTimeZoneRule::operator==(const TimeZoneRule& that) const { + return ((this == &that) || + (typeid(*this) == typeid(that) && +@@ -226,7 +226,7 @@ + return *this; + } + +-UBool ++bool + AnnualTimeZoneRule::operator==(const TimeZoneRule& that) const { + if (this == &that) { + return TRUE; +@@ -445,7 +445,7 @@ + return *this; + } + +-UBool ++bool + TimeArrayTimeZoneRule::operator==(const TimeZoneRule& that) const { + if (this == &that) { + return TRUE; +--- source/i18n/unicode/rbtz.h ++++ source/i18n/unicode/rbtz.h +@@ -85,6 +85,7 @@ + * @stable ICU 3.8 + */ + virtual UBool operator!=(const TimeZone& that) const; ++ UBool operator!=(const RuleBasedTimeZone& that) const {return !operator==(that);} + + /** + * Adds the <code>TimeZoneRule</code> which represents time transitions. +--- source/i18n/unicode/simpletz.h ++++ source/i18n/unicode/simpletz.h +@@ -110,6 +110,7 @@ + * @stable ICU 2.0 + */ + virtual UBool operator==(const TimeZone& that) const; ++ UBool operator!=(const SimpleTimeZone& that) const {return !operator==(that);} + + /** + * Constructs a SimpleTimeZone with the given raw GMT offset and time zone ID, +--- source/i18n/unicode/smpdtfmt.h ++++ source/i18n/unicode/smpdtfmt.h +@@ -874,6 +874,7 @@ + * @stable ICU 2.0 + */ + virtual UBool operator==(const Format& other) const; ++ UBool operator!=(const SimpleDateFormat& that) const {return !operator==(that);} + + + using DateFormat::format; +--- source/i18n/unicode/stsearch.h ++++ source/i18n/unicode/stsearch.h +@@ -297,6 +297,7 @@ + * @stable ICU 2.0 + */ + virtual UBool operator==(const SearchIterator &that) const; ++ UBool operator!=(const StringSearch &that) const {return !operator==(that);} + + // public get and set methods ---------------------------------------- + +--- source/i18n/unicode/tzrule.h ++++ source/i18n/unicode/tzrule.h +@@ -54,7 +54,7 @@ + * @return true if the given <code>TimeZoneRule</code> objects are semantically equal. + * @stable ICU 3.8 + */ +- virtual UBool operator==(const TimeZoneRule& that) const; ++ virtual bool operator==(const TimeZoneRule& that) const; + + /** + * Return true if the given <code>TimeZoneRule</code> objects are semantically unequal. Objects +@@ -245,7 +245,7 @@ + * @return true if the given <code>TimeZoneRule</code> objects are semantically equal. + * @stable ICU 3.8 + */ +- virtual UBool operator==(const TimeZoneRule& that) const; ++ virtual bool operator==(const TimeZoneRule& that) const; + + /** + * Return true if the given <code>TimeZoneRule</code> objects are semantically unequal. Objects +@@ -255,6 +255,7 @@ + * @stable ICU 3.8 + */ + virtual UBool operator!=(const TimeZoneRule& that) const; ++ UBool operator!=(const InitialTimeZoneRule& that) const {return !operator==(that);} + + /** + * Gets the time when this rule takes effect in the given year. +@@ -456,7 +457,7 @@ + * @return true if the given <code>TimeZoneRule</code> objects are semantically equal. + * @stable ICU 3.8 + */ +- virtual UBool operator==(const TimeZoneRule& that) const; ++ virtual bool operator==(const TimeZoneRule& that) const; + + /** + * Return true if the given <code>TimeZoneRule</code> objects are semantically unequal. Objects +@@ -672,7 +673,7 @@ + * @return true if the given <code>TimeZoneRule</code> objects are semantically equal. + * @stable ICU 3.8 + */ +- virtual UBool operator==(const TimeZoneRule& that) const; ++ virtual bool operator==(const TimeZoneRule& that) const; + + /** + * Return true if the given <code>TimeZoneRule</code> objects are semantically unequal. Objects +--- source/i18n/unicode/vtzone.h ++++ source/i18n/unicode/vtzone.h +@@ -81,6 +81,7 @@ + * @stable ICU 3.8 + */ + virtual UBool operator!=(const TimeZone& that) const; ++ UBool operator!=(const VTimeZone& that) const {return !operator==(that);} + + /** + * Create a <code>VTimeZone</code> instance by the time zone ID. diff --git a/external/icu/cross-bin/icu-config b/external/icu/cross-bin/icu-config new file mode 100755 index 000000000..8ccf94f9b --- /dev/null +++ b/external/icu/cross-bin/icu-config @@ -0,0 +1,12 @@ +#!/bin/sh + +case $1 in +--version) + echo whatever + ;; +--cppflags) + echo ${ICU_CFLAGS} + ;; +--ldflags-searchpath) + echo ${ICU_LIBS} +esac diff --git a/external/icu/gcc9.patch b/external/icu/gcc9.patch new file mode 100644 index 000000000..5c9808f8c --- /dev/null +++ b/external/icu/gcc9.patch @@ -0,0 +1,26 @@ +--- source/i18n/unicode/format.h ++++ source/i18n/unicode/format.h +@@ -22,6 +22,13 @@ + + #ifndef FORMAT_H + #define FORMAT_H ++ ++#ifdef __GNUC__ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wpragmas" // for old GCC ++#pragma GCC diagnostic ignored "-Wunknown-warning-option" // for Clang ++#pragma GCC diagnostic ignored "-Wdeprecated-copy" ++#endif + + + #include "unicode/utypes.h" +@@ -314,5 +314,9 @@ + + #endif /* U_SHOW_CPLUSPLUS_API */ + ++#ifdef __GNUC__ ++#pragma GCC diagnostic pop ++#endif ++ + #endif // _FORMAT + //eof diff --git a/external/icu/icu4c-aix.patch.1 b/external/icu/icu4c-aix.patch.1 new file mode 100644 index 000000000..77982163b --- /dev/null +++ b/external/icu/icu4c-aix.patch.1 @@ -0,0 +1,143 @@ +diff -ur icu.org/source/config/mh-aix-gcc icu/source/config/mh-aix-gcc +--- icu.org/source/config/mh-aix-gcc 2016-06-15 20:58:17.000000000 +0200 ++++ icu/source/config/mh-aix-gcc 2017-04-21 21:58:49.731432198 +0200 +@@ -18,84 +18,29 @@ + GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) + GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) + +-## Commands to link +-## We need to use the C++ linker, even when linking C programs, since +-## our libraries contain C++ code (C++ static init not called) +-LINK.c= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) +-LINK.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) +- +-## Shared library options +-LD_SOOPTIONS= -Wl,-bsymbolic +- +-## Commands to make a shared library +-SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_SOOPTIONS) +-SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_SOOPTIONS) +- +-## Compiler switch to embed a runtime search path +-LD_RPATH= -I +-LD_RPATH_PRE= ++## Flags for position independent code ++SHAREDLIBCFLAGS = -fPIC ++SHAREDLIBCXXFLAGS = -fPIC ++SHAREDLIBCPPFLAGS = -DPIC ++ ++## Additional flags when building libraries and with threads ++THREADSCPPFLAGS = -D_REENTRANT -D_THREAD_SAFE ++LIBCPPFLAGS = + +-## enable the shared lib loader +-LDFLAGS += -Wl,-bbigtoc ++LD_RPATH= ++LD_RPATH_PRE= + + ## These are the library specific LDFLAGS + LDFLAGSICUDT=-nodefaultlibs -nostdlib + +-## We need to delete things prior to linking, or else we'll get +-## SEVERE ERROR: output file in use .. on AIX. +-## But, shell script version should NOT delete target as we don't +-## have $@ in that context. (SH = only shell script, icu-config) +-AIX_PREDELETE=rm -f $@ ; +-#SH# AIX_PREDELETE= +- + ## Environment variable to set a runtime search path + LDLIBRARYPATH_ENVVAR = LIBPATH + +-## Override Versioned target for a shared library. +-FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO) +-MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) +-SHARED_OBJECT = $(notdir $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))) +-SHARED_OBJECT_NO_VERSION = $(basename $(SO_TARGET)).$(SOBJ) +- +-# The following is for Makefile.inc's use. +-ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR) +- +-# this one is for icudefs.mk's use +-ifeq ($(ENABLE_SHARED),YES) +-SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR) +-endif +- +-## Compiler switch to embed a library name. Not present on AIX. +-LD_SONAME = +- +-## The type of assembly needed when pkgdata is used for generating shared libraries. +-GENCCODE_ASSEMBLY=-a xlc +- + ## Shared object suffix +-SOBJ= so +-# without the -brtl option, the library names use .a. AIX is funny that way. +-SO= a +-A= a ++SO= so + + ## Non-shared intermediate object suffix +-STATIC_O = o +- +-## Special AIX rules +- +-## Build archive from shared object +-%.a : %.so +- ln -f $< $(SHARED_OBJECT_NO_VERSION) +- $(AR) $(ARFLAGS) $@ $(SHARED_OBJECT_NO_VERSION) +- rm -f $(SHARED_OBJECT_NO_VERSION) +-$(LIBDIR)/%.a : %.so +- ln -f $< $(SHARED_OBJECT_NO_VERSION) +- $(AR) $(ARFLAGS) $@ $(SHARED_OBJECT_NO_VERSION) +- rm -f $(SHARED_OBJECT_NO_VERSION) +- +-## Build import list from export list +-%.e : %.exp +- @echo "Building an import list for $<" +- @$(SHELL) -ec "echo '#! $*.a($*.so)' | cat - $< > $@" ++STATIC_O = ao + + ## Compilation rules + %.$(STATIC_O): $(srcdir)/%.c +@@ -123,10 +68,10 @@ + [ -s $@ ] || rm -f $@' + + ## Versioned libraries rules +-%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) +- $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ +-%.$(SO): %$(SO_TARGET_VERSION).$(SO) +- $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ ++%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) ++ $(RM) $@ && ln -s ${<F} $@ ++%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) ++ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@ + + + ## BIR - bind with internal references [so app data and icu data doesn't collide] +diff -ur icu.org/source/tools/pkgdata/pkgdata.cpp icu/source/tools/pkgdata/pkgdata.cpp +--- icu.org/source/tools/pkgdata/pkgdata.cpp 2017-03-21 02:03:49.000000000 +0100 ++++ icu/source/tools/pkgdata/pkgdata.cpp 2017-04-21 21:58:49.732432195 +0200 +@@ -934,7 +934,7 @@ + + uprv_strcat(pkgDataFlags[SO_EXT], "."); + uprv_strcat(pkgDataFlags[SO_EXT], pkgDataFlags[A_EXT]); +-#elif U_PLATFORM == U_PF_OS400 || defined(_AIX) ++#elif U_PLATFORM == U_PF_OS400 + sprintf(libFileNames[LIB_FILE_VERSION_TMP], "%s%s%s", + libFileNames[LIB_FILE], + FILE_EXTENSION_SEP, +@@ -1407,15 +1407,6 @@ + pkgDataFlags[LDICUDTFLAGS], + targetDir, + libFileNames[LIB_FILE_CYGWIN_VERSION], +-#elif U_PLATFORM == U_PF_AIX +- sprintf(cmd, "%s %s%s;%s %s -o %s%s %s %s%s %s %s", +- RM_CMD, +- targetDir, +- libFileNames[LIB_FILE_VERSION_TMP], +- pkgDataFlags[GENLIB], +- pkgDataFlags[LDICUDTFLAGS], +- targetDir, +- libFileNames[LIB_FILE_VERSION_TMP], + #else + sprintf(cmd, "%s %s -o %s%s %s %s%s %s %s", + pkgDataFlags[GENLIB], diff --git a/external/icu/icu4c-android.patch.1 b/external/icu/icu4c-android.patch.1 new file mode 100644 index 000000000..602d225d7 --- /dev/null +++ b/external/icu/icu4c-android.patch.1 @@ -0,0 +1,75 @@ +diff -ur icu.org/source/common/unicode/platform.h icu/source/common/unicode/platform.h +--- icu.org/source/common/unicode/platform.h 2019-10-03 13:16:41.000000000 +0200 ++++ icu/source/common/unicode/platform.h 2019-10-29 22:58:26.881221287 +0100 +@@ -818,7 +818,7 @@ + UPRV_HAS_DECLSPEC_ATTRIBUTE(dllimport)) + # define U_EXPORT __declspec(dllexport) + #elif defined(__GNUC__) +-# define U_EXPORT __attribute__((visibility("default"))) ++# define U_EXPORT + #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ + || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) + # define U_EXPORT __global +diff -ur icu.org/source/config/mh-linux icu/source/config/mh-linux +--- icu.org/source/config/mh-linux 2018-09-29 02:34:41.000000000 +0200 ++++ icu/source/config/mh-linux 2018-10-20 00:33:36.558130876 +0200 +@@ -27,7 +27,7 @@ + + ## Compiler switch to embed a library name + # The initial tab in the next line is to prevent icu-config from reading it. +- LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) ++ #LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) + #SH# # We can't depend on MIDDLE_SO_TARGET being set. + #SH# LD_SONAME= + +diff -ur icu.org/source/configure icu/source/configure +--- icu.org/source/configure 2018-10-02 00:39:56.000000000 +0200 ++++ icu/source/configure 2018-10-20 00:33:36.559130874 +0200 +@@ -5207,7 +5207,7 @@ + else + icu_cv_host_frag=mh-linux-va + fi ;; +-*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;; ++*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu|*-*-*-androideabi*) icu_cv_host_frag=mh-linux ;; + i[34567]86-*-cygwin) + if test "$GCC" = yes; then + icu_cv_host_frag=mh-cygwin +@@ -6400,6 +6400,10 @@ + # Check to see if genccode can generate simple assembly. + GENCCODE_ASSEMBLY= + case "${host}" in ++arm-*-linux-androideabi) ++ if test "$GCC" = yes; then ++ GENCCODE_ASSEMBLY="-a gcc-android-arm" ++ fi ;; + *-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu) + if test "$GCC" = yes; then + # We're using gcc, and the simple -a gcc command line works for genccode +@@ -7499,6 +7503,10 @@ + # wchar_t can be used + CHECK_UTF16_STRING_RESULT="available" + ;; ++*-*-*-androideabi|mips-unknown-linux-android) ++ # no UTF-16 strings thanks, I think, this is to avoid the -std=c++0x which causes trouble with uint64_t ++ CHECK_UTF16_STRING_RESULT="nope" ++ ;; + *) + ;; + esac +diff -ur icu.org/source/i18n/decimfmt.cpp icu/source/i18n/decimfmt.cpp +--- icu.org/source/i18n/decimfmt.cpp 2018-10-02 00:39:56.000000000 +0200 ++++ icu/source/i18n/decimfmt.cpp 2018-10-20 00:33:36.560130873 +0200 +@@ -9,6 +9,13 @@ + // Helpful in toString methods and elsewhere. + #define UNISTR_FROM_STRING_EXPLICIT + ++#ifdef __ANDROID__ ++#ifndef ARM ++#define ARM ++#endif ++#include <android/compatibility.hxx> ++#endif ++ + #include <cmath> + #include <cstdlib> + #include <stdlib.h> diff --git a/external/icu/icu4c-build.patch.1 b/external/icu/icu4c-build.patch.1 new file mode 100644 index 000000000..a878de732 --- /dev/null +++ b/external/icu/icu4c-build.patch.1 @@ -0,0 +1,91 @@ +diff -ur icu.org/source/config/mh-darwin icu/source/config/mh-darwin +--- icu.org/source/config/mh-darwin 2016-06-15 20:58:17.000000000 +0200 ++++ icu/source/config/mh-darwin 2017-04-21 21:30:23.584568210 +0200 +@@ -30,11 +30,7 @@ + SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) + + ## Compiler switches to embed a library name and version information +-ifeq ($(ENABLE_RPATH),YES) +-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) +-else +-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE) +-endif ++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @__________________________________________________URELIB/$(notdir $(MIDDLE_SO_TARGET)) + + ## Compiler switch to embed a runtime search path + LD_RPATH= +@@ -50,10 +46,6 @@ + ## Non-shared intermediate object suffix + STATIC_O = ao + +-## Override Versioned target for a shared library. +-FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) +-MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) +- + ## Compilation and dependency rules + %.$(STATIC_O): $(srcdir)/%.c + $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -MMD -MT "$*.d $*.o $*.$(STATIC_O)" -o $@ $<) +@@ -67,16 +59,10 @@ + + ## Versioned libraries rules + +-%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO) ++%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) + $(RM) $@ && ln -s ${<F} $@ +-%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO) +- $(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@ +- +-# tzcode option +-TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED +- +-# genren opts +-GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt' ++%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) ++ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@ + + ## Remove shared library 's' + STATIC_PREFIX_WHEN_USED = +diff -ur icu.org/source/tools/toolutil/pkg_genc.cpp icu/source/tools/toolutil/pkg_genc.cpp +--- icu.org/source/tools/toolutil/pkg_genc.cpp 2017-04-13 11:46:02.000000000 +0200 ++++ icu/source/tools/toolutil/pkg_genc.cpp 2017-04-21 21:30:23.583568212 +0200 +@@ -160,6 +160,28 @@ + + ".long ","",HEX_0X + }, ++ {"gcc-android-arm", ++ "\t.arch armv5te\n" ++ "\t.fpu softvfp\n" ++ "\t.eabi_attribute 20, 1\n" ++ "\t.eabi_attribute 21, 1\n" ++ "\t.eabi_attribute 23, 3\n" ++ "\t.eabi_attribute 24, 1\n" ++ "\t.eabi_attribute 25, 1\n" ++ "\t.eabi_attribute 26, 2\n" ++ "\t.eabi_attribute 30, 6\n" ++ "\t.eabi_attribute 18, 4\n" ++ "\t.file \"%s.s\"\n" ++ "\t.global %s\n" ++ "\t.section .rodata\n" ++ "\t.align 2\n" ++ "\t.type %s, %%object\n" ++ "%s:\n", ++ ++ "\t.word ", ++ "\t.section .note.GNU-stack,\"\",%%progbits\n", ++ HEX_0X ++ }, + /* 16 bytes alignment. */ + /* http://docs.oracle.com/cd/E19641-01/802-1947/802-1947.pdf */ + {"sun", +diff -ur icu.org/source/tools/toolutil/pkg_genc.h icu/source/tools/toolutil/pkg_genc.h +--- icu.org/source/tools/toolutil/pkg_genc.h 2017-01-20 01:20:31.000000000 +0100 ++++ icu/source/tools/toolutil/pkg_genc.h 2017-04-21 21:30:23.582568215 +0200 +@@ -60,7 +60,7 @@ + #endif + + #define LARGE_BUFFER_MAX_SIZE 2048 +-#define SMALL_BUFFER_MAX_SIZE 512 ++#define SMALL_BUFFER_MAX_SIZE 2048 + #define SMALL_BUFFER_FLAG_NAMES 32 + #define BUFFER_PADDING_SIZE 20 + diff --git a/external/icu/icu4c-clang-cl.patch.1 b/external/icu/icu4c-clang-cl.patch.1 new file mode 100644 index 000000000..a111a0df9 --- /dev/null +++ b/external/icu/icu4c-clang-cl.patch.1 @@ -0,0 +1,28 @@ +diff -ur icu.org/source/config/mh-cygwin-msvc icu/source/config/mh-cygwin-msvc +--- icu.org/source/config/mh-cygwin-msvc 2017-01-23 01:38:28.000000000 +0100 ++++ icu/source/config/mh-cygwin-msvc 2017-04-21 23:07:28.482892025 +0200 +@@ -55,8 +55,8 @@ + LDFLAGS+=-nologo + + # Commands to compile +-COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c +-COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c ++COMPILE.c= true && $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c ++COMPILE.cc= true && $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c + + # Commands to link + LINK.c= LINK.EXE -subsystem:console $(LDFLAGS) +diff -ur icu.org/source/runConfigureICU icu/source/runConfigureICU +--- icu.org/source/runConfigureICU 2017-01-23 01:38:28.000000000 +0100 ++++ icu/source/runConfigureICU 2017-04-21 23:07:28.482892025 +0200 +@@ -261,8 +261,8 @@ + Cygwin/MSVC) + THE_OS="Windows with Cygwin" + THE_COMP="Microsoft Visual C++" +- CC=cl; export CC +- CXX=cl; export CXX ++ CC=${CC-cl}; export CC ++ CXX=${CXX-cl}; export CXX + RELEASE_CFLAGS='-Gy -MD' + RELEASE_CXXFLAGS='-Gy -MD' + DEBUG_CFLAGS='-FS -Zi -MDd' diff --git a/external/icu/icu4c-icudata-stdlibs.patch.1 b/external/icu/icu4c-icudata-stdlibs.patch.1 new file mode 100644 index 000000000..c8d66c6ed --- /dev/null +++ b/external/icu/icu4c-icudata-stdlibs.patch.1 @@ -0,0 +1,14 @@ +diff -ur icu.org/source/config/mh-linux icu/source/config/mh-linux +--- icu.org/source/config/mh-linux 2017-04-21 23:09:57.588533707 +0200 ++++ icu/source/config/mh-linux 2017-04-21 23:11:38.075292226 +0200 +@@ -27,7 +27,9 @@ + RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN' + + ## These are the library specific LDFLAGS +-LDFLAGSICUDT=-nodefaultlibs -nostdlib ++#LDFLAGSICUDT=-nodefaultlibs -nostdlib ++# Debian change: linking icudata as data only causes too many problems. ++LDFLAGSICUDT= + + ## Compiler switch to embed a library name + # The initial tab in the next line is to prevent icu-config from reading it. diff --git a/external/icu/icu4c-khmerbreakengine.patch.1 b/external/icu/icu4c-khmerbreakengine.patch.1 new file mode 100644 index 000000000..272d0b8ab --- /dev/null +++ b/external/icu/icu4c-khmerbreakengine.patch.1 @@ -0,0 +1,845 @@ +diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp +--- icu.org/source/common/dictbe.cpp 2020-04-22 22:04:20.000000000 +0200 ++++ icu/source/common/dictbe.cpp 2020-05-11 18:55:07.702282061 +0200 +@@ -32,7 +32,19 @@ + ****************************************************************** + */ + +-DictionaryBreakEngine::DictionaryBreakEngine() { ++DictionaryBreakEngine::DictionaryBreakEngine() ++ : fTypes(0), clusterLimit(0) { ++} ++ ++DictionaryBreakEngine::DictionaryBreakEngine(uint32_t breakTypes) ++ : fTypes(breakTypes), clusterLimit(3) { ++ UErrorCode status = U_ZERO_ERROR; ++ fViramaSet.applyPattern(UNICODE_STRING_SIMPLE("[[:ccc=VR:]]"), status); ++ ++ // note Skip Sets contain fIgnoreSet characters too. ++ fSkipStartSet.applyPattern(UNICODE_STRING_SIMPLE("[[:lb=OP:][:lb=QU:]\\u200C\\u200D\\u2060]"), status); ++ fSkipEndSet.applyPattern(UNICODE_STRING_SIMPLE("[[:lb=CP:][:lb=QU:][:lb=EX:][:lb=CL:]\\u200C\\u200D\\u2060]"), status); ++ fNBeforeSet.applyPattern(UNICODE_STRING_SIMPLE("[[:lb=CR:][:lb=LF:][:lb=NL:][:lb=SP:][:lb=ZW:][:lb=IS:][:lb=BA:][:lb=NS:]]"), status); + } + + DictionaryBreakEngine::~DictionaryBreakEngine() { +@@ -79,6 +91,169 @@ + fSet.compact(); + } + ++bool ++DictionaryBreakEngine::scanBeforeStart(UText *text, int32_t& start, bool &doBreak) const { ++ UErrorCode status = U_ZERO_ERROR; ++ UText* ut = utext_clone(NULL, text, false, true, &status); ++ utext_setNativeIndex(ut, start); ++ UChar32 c = utext_current32(ut); ++ bool res = false; ++ doBreak = true; ++ while (start >= 0) { ++ if (!fSkipStartSet.contains(c)) { ++ res = (c == ZWSP); ++ break; ++ } ++ --start; ++ c = utext_previous32(ut); ++ doBreak = false; ++ } ++ utext_close(ut); ++ return res; ++} ++ ++bool ++DictionaryBreakEngine::scanAfterEnd(UText *text, int32_t textEnd, int32_t& end, bool &doBreak) const { ++ UErrorCode status = U_ZERO_ERROR; ++ UText* ut = utext_clone(NULL, text, false, true, &status); ++ utext_setNativeIndex(ut, end); ++ UChar32 c = utext_current32(ut); ++ bool res = false; ++ doBreak = !fNBeforeSet.contains(c); ++ while (end < textEnd) { ++ if (!fSkipEndSet.contains(c)) { ++ res = (c == ZWSP); ++ break; ++ } ++ ++end; ++ c = utext_next32(ut); ++ doBreak = false; ++ } ++ utext_close(ut); ++ return res; ++} ++ ++void ++DictionaryBreakEngine::scanBackClusters(UText *text, int32_t textStart, int32_t& start) const { ++ UChar32 c = 0; ++ start = utext_getNativeIndex(text); ++ while (start > textStart) { ++ c = utext_previous32(text); ++ --start; ++ if (!fSkipEndSet.contains(c)) ++ break; ++ } ++ for (int i = 0; i < clusterLimit; ++i) { // scan backwards clusterLimit clusters ++ while (start > textStart) { ++ while (fIgnoreSet.contains(c)) ++ c = utext_previous32(text); ++ if (!fMarkSet.contains(c)) { ++ if (fBaseSet.contains(c)) { ++ c = utext_previous32(text); ++ if (!fViramaSet.contains(c)) { // Virama (e.g. coeng) preceding base. Treat sequence as a mark ++ utext_next32(text); ++ c = utext_current32(text); ++ break; ++ } else { ++ --start; ++ } ++ } else { ++ break; ++ } ++ } ++ c = utext_previous32(text); ++ --start; ++ } ++ if (!fBaseSet.contains(c) || start < textStart) { // not a cluster start so finish ++ break; ++ } ++ c = utext_previous32(text); ++ --start; // go round again ++ } // ignore hitting previous inhibitor since scanning for it should have found us! ++ ++start; // counteract --before ++} ++ ++void ++DictionaryBreakEngine::scanFwdClusters(UText *text, int32_t textEnd, int32_t& end) const { ++ UChar32 c = utext_current32(text); ++ end = utext_getNativeIndex(text); ++ while (end < textEnd) { ++ if (!fSkipStartSet.contains(c)) ++ break; ++ utext_next32(text); ++ c = utext_current32(text); ++ ++end; ++ } ++ for (int i = 0; i < clusterLimit; ++i) { // scan forwards clusterLimit clusters ++ while (fIgnoreSet.contains(c)) { ++ utext_next32(text); ++ c = utext_current32(text); ++ } ++ if (fBaseSet.contains(c)) { ++ while (end < textEnd) { ++ utext_next32(text); ++ c = utext_current32(text); ++ ++end; ++ if (!fMarkSet.contains(c)) ++ break; ++ else if (fViramaSet.contains(c)) { // handle coeng + base as mark ++ utext_next32(text); ++ c = utext_current32(text); ++ ++end; ++ if (!fBaseSet.contains(c)) ++ break; ++ } ++ } ++ } else { ++ --end; // bad char so break after char before it ++ break; ++ } ++ } ++} ++ ++bool ++DictionaryBreakEngine::scanWJ(UText *text, int32_t &start, int32_t end, int32_t &before, int32_t &after) const { ++ UErrorCode status = U_ZERO_ERROR; ++ UText* ut = utext_clone(NULL, text, false, true, &status); ++ int32_t nat = start; ++ utext_setNativeIndex(ut, nat); ++ bool foundFirst = true; ++ int32_t curr = start; ++ while (nat < end) { ++ UChar32 c = utext_current32(ut); ++ if (c == ZWSP || c == WJ) { ++ curr = nat + 1; ++ if (foundFirst) // only scan backwards for first inhibitor ++ scanBackClusters(ut, start, before); ++ foundFirst = false; // don't scan backwards if we go around again. Also marks found something ++ ++ utext_next32(ut); ++ scanFwdClusters(ut, end, after); ++ nat = after + 1; ++ ++ if (c == ZWSP || c == WJ) { // did we hit another one? ++ continue; ++ } else { ++ break; ++ } ++ } ++ ++ ++nat; // keep hunting ++ utext_next32(ut); ++ } ++ ++ utext_close(ut); ++ ++ if (nat >= end && foundFirst) { ++ start = before = after = nat; ++ return false; // failed to find anything ++ } ++ else { ++ start = curr; ++ } ++ return true; // yup hit one ++} ++ + /* + ****************************************************************** + * PossibleWord +@@ -108,7 +283,7 @@ + ~PossibleWord() {} + + // Fill the list of candidates if needed, select the longest, and return the number found +- int32_t candidates( UText *text, DictionaryMatcher *dict, int32_t rangeEnd ); ++ int32_t candidates( UText *text, DictionaryMatcher *dict, int32_t rangeEnd, UnicodeSet const *ignoreSet = NULL, int32_t minLength = 0 ); + + // Select the currently marked candidate, point after it in the text, and invalidate self + int32_t acceptMarked( UText *text ); +@@ -129,12 +304,12 @@ + }; + + +-int32_t PossibleWord::candidates( UText *text, DictionaryMatcher *dict, int32_t rangeEnd ) { ++int32_t PossibleWord::candidates( UText *text, DictionaryMatcher *dict, int32_t rangeEnd, UnicodeSet const *ignoreSet, int32_t minLength) { + // TODO: If getIndex is too slow, use offset < 0 and add discardAll() + int32_t start = (int32_t)utext_getNativeIndex(text); + if (start != offset) { + offset = start; +- count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), cuLengths, cpLengths, NULL, &prefix); ++ count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), cuLengths, cpLengths, NULL, &prefix, ignoreSet, minLength); + // Dictionary leaves text after longest prefix, not longest word. Back up. + if (count <= 0) { + utext_setNativeIndex(text, start); +@@ -815,53 +990,30 @@ + * KhmerBreakEngine + */ + +-// How many words in a row are "good enough"? +-static const int32_t KHMER_LOOKAHEAD = 3; +- +-// Will not combine a non-word with a preceding dictionary word longer than this +-static const int32_t KHMER_ROOT_COMBINE_THRESHOLD = 3; +- +-// Will not combine a non-word that shares at least this much prefix with a +-// dictionary word, with a preceding word +-static const int32_t KHMER_PREFIX_COMBINE_THRESHOLD = 3; +- +-// Minimum word size +-static const int32_t KHMER_MIN_WORD = 2; +- +-// Minimum number of characters for two words +-static const int32_t KHMER_MIN_WORD_SPAN = KHMER_MIN_WORD * 2; +- + KhmerBreakEngine::KhmerBreakEngine(DictionaryMatcher *adoptDictionary, UErrorCode &status) +- : DictionaryBreakEngine(), ++ : DictionaryBreakEngine((1 << UBRK_WORD) | (1 << UBRK_LINE)), + fDictionary(adoptDictionary) + { + UTRACE_ENTRY(UTRACE_UBRK_CREATE_BREAK_ENGINE); + UTRACE_DATA1(UTRACE_INFO, "dictbe=%s", "Khmr"); +- fKhmerWordSet.applyPattern(UNICODE_STRING_SIMPLE("[[:Khmr:]&[:LineBreak=SA:]]"), status); ++ ++ clusterLimit = 3; ++ ++ fKhmerWordSet.applyPattern(UNICODE_STRING_SIMPLE("[[:Khmr:]\\u2060\\u200C\\u200D]"), status); + if (U_SUCCESS(status)) { + setCharacters(fKhmerWordSet); + } + fMarkSet.applyPattern(UNICODE_STRING_SIMPLE("[[:Khmr:]&[:LineBreak=SA:]&[:M:]]"), status); +- fMarkSet.add(0x0020); +- fEndWordSet = fKhmerWordSet; +- fBeginWordSet.add(0x1780, 0x17B3); +- //fBeginWordSet.add(0x17A3, 0x17A4); // deprecated vowels +- //fEndWordSet.remove(0x17A5, 0x17A9); // Khmer independent vowels that can't end a word +- //fEndWordSet.remove(0x17B2); // Khmer independent vowel that can't end a word +- fEndWordSet.remove(0x17D2); // KHMER SIGN COENG that combines some following characters +- //fEndWordSet.remove(0x17B6, 0x17C5); // Remove dependent vowels +-// fEndWordSet.remove(0x0E31); // MAI HAN-AKAT +-// fEndWordSet.remove(0x0E40, 0x0E44); // SARA E through SARA AI MAIMALAI +-// fBeginWordSet.add(0x0E01, 0x0E2E); // KO KAI through HO NOKHUK +-// fBeginWordSet.add(0x0E40, 0x0E44); // SARA E through SARA AI MAIMALAI +-// fSuffixSet.add(THAI_PAIYANNOI); +-// fSuffixSet.add(THAI_MAIYAMOK); ++ fIgnoreSet.add(0x2060); // WJ ++ fIgnoreSet.add(0x200C, 0x200D); // ZWJ, ZWNJ ++ fBaseSet.applyPattern(UNICODE_STRING_SIMPLE("[[:Khmr:]&[:lb=SA:]&[:^M:]]"), status); ++ fPuncSet.applyPattern(UNICODE_STRING_SIMPLE("[\\u17D4\\u17D5\\u17D6\\u17D7\\u17D9:]"), status); + + // Compact for caching. + fMarkSet.compact(); +- fEndWordSet.compact(); +- fBeginWordSet.compact(); +-// fSuffixSet.compact(); ++ fIgnoreSet.compact(); ++ fBaseSet.compact(); ++ fPuncSet.compact(); + UTRACE_EXIT_STATUS(status); + } + +@@ -874,180 +1026,204 @@ + int32_t rangeStart, + int32_t rangeEnd, + UVector32 &foundBreaks ) const { +- if ((rangeEnd - rangeStart) < KHMER_MIN_WORD_SPAN) { +- return 0; // Not enough characters for two words +- } +- +- uint32_t wordsFound = 0; +- int32_t cpWordLength = 0; +- int32_t cuWordLength = 0; +- int32_t current; ++ uint32_t wordsFound = foundBreaks.size(); + UErrorCode status = U_ZERO_ERROR; +- PossibleWord words[KHMER_LOOKAHEAD]; +- ++ int32_t before = 0; ++ int32_t after = 0; ++ int32_t finalBefore = 0; ++ int32_t initAfter = 0; ++ int32_t scanStart = rangeStart; ++ int32_t scanEnd = rangeEnd; ++ ++ bool startZwsp = false; ++ bool breakStart = false; ++ bool breakEnd = false; ++ ++ if (rangeStart > 0) { ++ --scanStart; ++ startZwsp = scanBeforeStart(text, scanStart, breakStart); ++ } + utext_setNativeIndex(text, rangeStart); ++ scanFwdClusters(text, rangeEnd, initAfter); ++ bool endZwsp = scanAfterEnd(text, utext_nativeLength(text), scanEnd, breakEnd); ++ utext_setNativeIndex(text, rangeEnd - 1); ++ scanBackClusters(text, rangeStart, finalBefore); ++ if (finalBefore < initAfter) { // the whole run is tented so no breaks ++ if (breakStart || fTypes < UBRK_LINE) ++ foundBreaks.push(rangeStart, status); ++ if (breakEnd || fTypes < UBRK_LINE) ++ foundBreaks.push(rangeEnd, status); ++ return foundBreaks.size() - wordsFound; ++ } + +- while (U_SUCCESS(status) && (current = (int32_t)utext_getNativeIndex(text)) < rangeEnd) { +- cuWordLength = 0; +- cpWordLength = 0; +- +- // Look for candidate words at the current position +- int32_t candidates = words[wordsFound%KHMER_LOOKAHEAD].candidates(text, fDictionary, rangeEnd); +- +- // If we found exactly one, use that +- if (candidates == 1) { +- cuWordLength = words[wordsFound % KHMER_LOOKAHEAD].acceptMarked(text); +- cpWordLength = words[wordsFound % KHMER_LOOKAHEAD].markedCPLength(); +- wordsFound += 1; +- } ++ scanStart = rangeStart; ++ scanWJ(text, scanStart, rangeEnd, before, after); ++ if (startZwsp || initAfter >= before) { ++ after = initAfter; ++ before = 0; ++ } ++ if (!endZwsp && after > finalBefore && after < rangeEnd) ++ endZwsp = true; ++ if (endZwsp && before > finalBefore) ++ before = finalBefore; + +- // If there was more than one, see which one can take us forward the most words +- else if (candidates > 1) { +- // If we're already at the end of the range, we're done +- if ((int32_t)utext_getNativeIndex(text) >= rangeEnd) { +- goto foundBest; +- } +- do { +- int32_t wordsMatched = 1; +- if (words[(wordsFound + 1) % KHMER_LOOKAHEAD].candidates(text, fDictionary, rangeEnd) > 0) { +- if (wordsMatched < 2) { +- // Followed by another dictionary word; mark first word as a good candidate +- words[wordsFound % KHMER_LOOKAHEAD].markCurrent(); +- wordsMatched = 2; +- } ++ utext_setNativeIndex(text, rangeStart); ++ int32_t numCodePts = rangeEnd - rangeStart; ++ // bestSnlp[i] is the snlp of the best segmentation of the first i ++ // code points in the range to be matched. ++ UVector32 bestSnlp(numCodePts + 1, status); ++ bestSnlp.addElement(0, status); ++ for(int32_t i = 1; i <= numCodePts; i++) { ++ bestSnlp.addElement(kuint32max, status); ++ } + +- // If we're already at the end of the range, we're done +- if ((int32_t)utext_getNativeIndex(text) >= rangeEnd) { +- goto foundBest; +- } ++ // prev[i] is the index of the last code point in the previous word in ++ // the best segmentation of the first i characters. Note negative implies ++ // that the code point is part of an unknown word. ++ UVector32 prev(numCodePts + 1, status); ++ for(int32_t i = 0; i <= numCodePts; i++) { ++ prev.addElement(kuint32max, status); ++ } + +- // See if any of the possible second words is followed by a third word +- do { +- // If we find a third word, stop right away +- if (words[(wordsFound + 2) % KHMER_LOOKAHEAD].candidates(text, fDictionary, rangeEnd)) { +- words[wordsFound % KHMER_LOOKAHEAD].markCurrent(); +- goto foundBest; +- } +- } +- while (words[(wordsFound + 1) % KHMER_LOOKAHEAD].backUp(text)); +- } ++ const int32_t maxWordSize = 20; ++ UVector32 values(maxWordSize, status); ++ values.setSize(maxWordSize); ++ UVector32 lengths(maxWordSize, status); ++ lengths.setSize(maxWordSize); ++ ++ // Dynamic programming to find the best segmentation. ++ ++ // In outer loop, i is the code point index, ++ // ix is the corresponding string (code unit) index. ++ // They differ when the string contains supplementary characters. ++ int32_t ix = rangeStart; ++ for (int32_t i = 0; i < numCodePts; ++i, utext_setNativeIndex(text, ++ix)) { ++ if ((uint32_t)bestSnlp.elementAti(i) == kuint32max) { ++ continue; ++ } ++ ++ int32_t count; ++ count = fDictionary->matches(text, numCodePts - i, maxWordSize, ++ NULL, lengths.getBuffer(), values.getBuffer(), NULL, &fIgnoreSet, 2); ++ // Note: lengths is filled with code point lengths ++ // The NULL parameter is the ignored code unit lengths. ++ ++ for (int32_t j = 0; j < count; j++) { ++ int32_t ln = lengths.elementAti(j); ++ if (ln + i >= numCodePts) ++ continue; ++ utext_setNativeIndex(text, ln+ix); ++ int32_t c = utext_current32(text); ++ if (fMarkSet.contains(c) || c == 0x17D2) { // Coeng ++ lengths.removeElementAt(j); ++ values.removeElementAt(j); ++ --j; ++ --count; + } +- while (words[wordsFound % KHMER_LOOKAHEAD].backUp(text)); +-foundBest: +- cuWordLength = words[wordsFound % KHMER_LOOKAHEAD].acceptMarked(text); +- cpWordLength = words[wordsFound % KHMER_LOOKAHEAD].markedCPLength(); +- wordsFound += 1; + } +- +- // We come here after having either found a word or not. We look ahead to the +- // next word. If it's not a dictionary word, we will combine it with the word we +- // just found (if there is one), but only if the preceding word does not exceed +- // the threshold. +- // The text iterator should now be positioned at the end of the word we found. +- if ((int32_t)utext_getNativeIndex(text) < rangeEnd && cpWordLength < KHMER_ROOT_COMBINE_THRESHOLD) { +- // if it is a dictionary word, do nothing. If it isn't, then if there is +- // no preceding word, or the non-word shares less than the minimum threshold +- // of characters with a dictionary word, then scan to resynchronize +- if (words[wordsFound % KHMER_LOOKAHEAD].candidates(text, fDictionary, rangeEnd) <= 0 +- && (cuWordLength == 0 +- || words[wordsFound % KHMER_LOOKAHEAD].longestPrefix() < KHMER_PREFIX_COMBINE_THRESHOLD)) { +- // Look for a plausible word boundary +- int32_t remaining = rangeEnd - (current+cuWordLength); +- UChar32 pc; +- UChar32 uc; +- int32_t chars = 0; +- for (;;) { +- int32_t pcIndex = (int32_t)utext_getNativeIndex(text); +- pc = utext_next32(text); +- int32_t pcSize = (int32_t)utext_getNativeIndex(text) - pcIndex; +- chars += pcSize; +- remaining -= pcSize; +- if (remaining <= 0) { ++ if (count == 0) { ++ utext_setNativeIndex(text, ix); ++ int32_t c = utext_current32(text); ++ if (fPuncSet.contains(c) || fIgnoreSet.contains(c) || c == ZWSP) { ++ values.setElementAt(0, count); ++ lengths.setElementAt(1, count++); ++ } else if (fBaseSet.contains(c)) { ++ int32_t currix = utext_getNativeIndex(text); ++ do { ++ utext_next32(text); ++ c = utext_current32(text); ++ if (utext_getNativeIndex(text) >= rangeEnd) + break; +- } +- uc = utext_current32(text); +- if (fEndWordSet.contains(pc) && fBeginWordSet.contains(uc)) { +- // Maybe. See if it's in the dictionary. +- int32_t num_candidates = words[(wordsFound + 1) % KHMER_LOOKAHEAD].candidates(text, fDictionary, rangeEnd); +- utext_setNativeIndex(text, current+cuWordLength+chars); +- if (num_candidates > 0) { ++ if (c == 0x17D2) { // Coeng ++ utext_next32(text); ++ c = utext_current32(text); ++ if (!fBaseSet.contains(c) || utext_getNativeIndex(text) >= rangeEnd) { + break; ++ } else { ++ utext_next32(text); ++ c = utext_current32(text); ++ if (utext_getNativeIndex(text) >= rangeEnd) ++ break; + } + } +- } +- +- // Bump the word count if there wasn't already one +- if (cuWordLength <= 0) { +- wordsFound += 1; +- } ++ } while (fMarkSet.contains(c) || fIgnoreSet.contains(c)); ++ values.setElementAt(BADSNLP, count); ++ lengths.setElementAt(utext_getNativeIndex(text) - currix, count++); ++ } else { ++ values.setElementAt(BADSNLP, count); ++ lengths.setElementAt(1, count++); ++ } ++ } + +- // Update the length with the passed-over characters +- cuWordLength += chars; ++ for (int32_t j = 0; j < count; j++) { ++ uint32_t v = values.elementAti(j); ++ int32_t newSnlp = bestSnlp.elementAti(i) + v; ++ int32_t ln = lengths.elementAti(j); ++ utext_setNativeIndex(text, ln+ix); ++ int32_t c = utext_current32(text); ++ while ((fPuncSet.contains(c) || fIgnoreSet.contains(c)) && ln + i < numCodePts) { ++ ++ln; ++ utext_next32(text); ++ c = utext_current32(text); + } +- else { +- // Back up to where we were for next iteration +- utext_setNativeIndex(text, current+cuWordLength); ++ int32_t ln_j_i = ln + i; // yes really i! ++ if (newSnlp < bestSnlp.elementAti(ln_j_i)) { ++ if (v == BADSNLP) { ++ int32_t p = prev.elementAti(i); ++ if (p < 0) ++ prev.setElementAt(p, ln_j_i); ++ else ++ prev.setElementAt(-i, ln_j_i); ++ } ++ else ++ prev.setElementAt(i, ln_j_i); ++ bestSnlp.setElementAt(newSnlp, ln_j_i); + } + } +- +- // Never stop before a combining mark. +- int32_t currPos; +- while ((currPos = (int32_t)utext_getNativeIndex(text)) < rangeEnd && fMarkSet.contains(utext_current32(text))) { +- utext_next32(text); +- cuWordLength += (int32_t)utext_getNativeIndex(text) - currPos; ++ } ++ // Start pushing the optimal offset index into t_boundary (t for tentative). ++ // prev[numCodePts] is guaranteed to be meaningful. ++ // We'll first push in the reverse order, i.e., ++ // t_boundary[0] = numCodePts, and afterwards do a swap. ++ UVector32 t_boundary(numCodePts+1, status); ++ ++ int32_t numBreaks = 0; ++ // No segmentation found, set boundary to end of range ++ while (numCodePts >= 0 && (uint32_t)bestSnlp.elementAti(numCodePts) == kuint32max) { ++ --numCodePts; ++ } ++ if (numCodePts < 0) { ++ t_boundary.addElement(numCodePts, status); ++ numBreaks++; ++ } else { ++ for (int32_t i = numCodePts; (uint32_t)i != kuint32max; i = prev.elementAti(i)) { ++ if (i < 0) i = -i; ++ t_boundary.addElement(i, status); ++ numBreaks++; + } ++ U_ASSERT(prev.elementAti(t_boundary.elementAti(numBreaks - 1)) == 0); ++ } + +- // Look ahead for possible suffixes if a dictionary word does not follow. +- // We do this in code rather than using a rule so that the heuristic +- // resynch continues to function. For example, one of the suffix characters +- // could be a typo in the middle of a word. +-// if ((int32_t)utext_getNativeIndex(text) < rangeEnd && wordLength > 0) { +-// if (words[wordsFound%KHMER_LOOKAHEAD].candidates(text, fDictionary, rangeEnd) <= 0 +-// && fSuffixSet.contains(uc = utext_current32(text))) { +-// if (uc == KHMER_PAIYANNOI) { +-// if (!fSuffixSet.contains(utext_previous32(text))) { +-// // Skip over previous end and PAIYANNOI +-// utext_next32(text); +-// utext_next32(text); +-// wordLength += 1; // Add PAIYANNOI to word +-// uc = utext_current32(text); // Fetch next character +-// } +-// else { +-// // Restore prior position +-// utext_next32(text); +-// } +-// } +-// if (uc == KHMER_MAIYAMOK) { +-// if (utext_previous32(text) != KHMER_MAIYAMOK) { +-// // Skip over previous end and MAIYAMOK +-// utext_next32(text); +-// utext_next32(text); +-// wordLength += 1; // Add MAIYAMOK to word +-// } +-// else { +-// // Restore prior position +-// utext_next32(text); +-// } +-// } +-// } +-// else { +-// utext_setNativeIndex(text, current+wordLength); +-// } +-// } +- +- // Did we find a word on this iteration? If so, push it on the break stack +- if (cuWordLength > 0) { +- foundBreaks.push((current+cuWordLength), status); ++ // Now that we're done, convert positions in t_boundary[] (indices in ++ // the normalized input string) back to indices in the original input UText ++ // while reversing t_boundary and pushing values to foundBreaks. ++ for (int32_t i = numBreaks-1; i >= 0; i--) { ++ int32_t cpPos = t_boundary.elementAti(i); ++ if (cpPos == 0 && !breakStart && fTypes >= UBRK_LINE) continue; ++ int32_t utextPos = cpPos + rangeStart; ++ while (utextPos > after && scanWJ(text, utextPos, scanEnd, before, after)); ++ if (utextPos < before) { ++ // Boundaries are added to foundBreaks output in ascending order. ++ U_ASSERT(foundBreaks.size() == 0 ||foundBreaks.peeki() < utextPos); ++ foundBreaks.push(utextPos, status); + } + } +- ++ + // Don't return a break for the end of the dictionary range if there is one there. +- if (foundBreaks.peeki() >= rangeEnd) { ++ if (!breakEnd && fTypes >= UBRK_LINE && foundBreaks.peeki() >= rangeEnd) { + (void) foundBreaks.popi(); +- wordsFound -= 1; + } +- +- return wordsFound; ++ return foundBreaks.size() - wordsFound; + } + + #if !UCONFIG_NO_NORMALIZATION +diff -ur icu.org/source/common/dictbe.h icu/source/common/dictbe.h +--- icu.org/source/common/dictbe.h 2020-04-22 22:04:20.000000000 +0200 ++++ icu/source/common/dictbe.h 2020-05-11 19:08:24.754634732 +0200 +@@ -34,7 +34,8 @@ + * threads without synchronization.</p> + */ + class DictionaryBreakEngine : public LanguageBreakEngine { +- private: ++ protected: ++ + /** + * The set of characters handled by this engine + * @internal +@@ -42,14 +43,84 @@ + + UnicodeSet fSet; + ++ const int32_t WJ = 0x2060; ++ const int32_t ZWSP = 0x200B; ++ ++ /** ++ * The break types it was constructed with ++ * @internal ++ */ ++ uint32_t fTypes; ++ ++ /** ++ * A Unicode set of all viramas ++ * @internal ++ */ ++ UnicodeSet fViramaSet; ++ ++ /** ++ * A Unicode set of all base characters ++ * @internal ++ */ ++ UnicodeSet fBaseSet; ++ ++ /** ++ * A Unicode set of all marks ++ * @internal ++ */ ++ UnicodeSet fMarkSet; ++ ++ /** ++ * A Unicode set of all characters ignored ignored in dictionary matching ++ * @internal ++ */ ++ UnicodeSet fIgnoreSet; ++ ++ /** ++ * A Unicode set of all characters ignored ignored in dictionary matching ++ * @internal ++ */ ++ UnicodeSet fSkipStartSet; ++ ++ /** ++ * A Unicode set of all characters ignored ignored in dictionary matching ++ * @internal ++ */ ++ UnicodeSet fSkipEndSet; ++ ++ /** ++ * A Unicode set of all characters that should not be broken before ++ * @internal ++ */ ++ UnicodeSet fNBeforeSet; ++ ++ /** ++ * The number of clusters within which breaks are inhibited ++ * @internal ++ */ ++ int32_t clusterLimit; ++ ++ bool scanWJ(UText *text, int32_t &start, int32_t end, int32_t &before, int32_t &after) const; ++ ++ bool scanBeforeStart(UText *text, int32_t& start, bool &doBreak) const; ++ bool scanAfterEnd(UText *text, int32_t rangeEnd, int32_t& end, bool &doBreak) const; ++ void scanBackClusters(UText *text, int32_t textStart, int32_t& start) const; ++ void scanFwdClusters(UText *text, int32_t textEnd, int32_t& end) const; ++ + public: + + /** +- * <p>Constructor </p> ++ * <p>Default constructor.</p> ++ * + */ + DictionaryBreakEngine(); + + /** ++ * <p>Constructor with break types.</p> ++ */ ++ explicit DictionaryBreakEngine(uint32_t breakTypes); ++ ++ /** + * <p>Virtual destructor.</p> + */ + virtual ~DictionaryBreakEngine(); +@@ -293,11 +364,13 @@ + */ + + UnicodeSet fKhmerWordSet; +- UnicodeSet fEndWordSet; +- UnicodeSet fBeginWordSet; +- UnicodeSet fMarkSet; +- DictionaryMatcher *fDictionary; +- ++ UnicodeSet fBeginWordSet; ++ UnicodeSet fPuncSet; ++ DictionaryMatcher *fDictionary; ++ ++ const uint32_t BADSNLP = 256 * 20; ++ const uint32_t kuint32max = 0x7FFFFFFF; ++ + public: + + /** +diff -ur icu.org/source/common/dictionarydata.cpp icu/source/common/dictionarydata.cpp +--- icu.org/source/common/dictionarydata.cpp 2020-04-22 22:04:20.000000000 +0200 ++++ icu/source/common/dictionarydata.cpp 2020-05-11 18:50:43.703113749 +0200 +@@ -44,7 +44,7 @@ + + int32_t UCharsDictionaryMatcher::matches(UText *text, int32_t maxLength, int32_t limit, + int32_t *lengths, int32_t *cpLengths, int32_t *values, +- int32_t *prefix) const { ++ int32_t *prefix, UnicodeSet const* ignoreSet, int32_t minLength) const { + + UCharsTrie uct(characters); + int32_t startingTextIndex = (int32_t)utext_getNativeIndex(text); +@@ -55,7 +55,13 @@ + UStringTrieResult result = (codePointsMatched == 0) ? uct.first(c) : uct.next(c); + int32_t lengthMatched = (int32_t)utext_getNativeIndex(text) - startingTextIndex; + codePointsMatched += 1; ++ if (ignoreSet != NULL && ignoreSet->contains(c)) { ++ continue; ++ } + if (USTRINGTRIE_HAS_VALUE(result)) { ++ if (codePointsMatched < minLength) { ++ continue; ++ } + if (wordCount < limit) { + if (values != NULL) { + values[wordCount] = uct.getValue(); +@@ -112,7 +118,7 @@ + + int32_t BytesDictionaryMatcher::matches(UText *text, int32_t maxLength, int32_t limit, + int32_t *lengths, int32_t *cpLengths, int32_t *values, +- int32_t *prefix) const { ++ int32_t *prefix, UnicodeSet const* ignoreSet, int32_t minLength) const { + BytesTrie bt(characters); + int32_t startingTextIndex = (int32_t)utext_getNativeIndex(text); + int32_t wordCount = 0; +@@ -122,7 +128,13 @@ + UStringTrieResult result = (codePointsMatched == 0) ? bt.first(transform(c)) : bt.next(transform(c)); + int32_t lengthMatched = (int32_t)utext_getNativeIndex(text) - startingTextIndex; + codePointsMatched += 1; ++ if (ignoreSet != NULL && ignoreSet->contains(c)) { ++ continue; ++ } + if (USTRINGTRIE_HAS_VALUE(result)) { ++ if (codePointsMatched < minLength) { ++ continue; ++ } + if (wordCount < limit) { + if (values != NULL) { + values[wordCount] = bt.getValue(); +diff -ur icu.org/source/common/dictionarydata.h icu/source/common/dictionarydata.h +--- icu.org/source/common/dictionarydata.h 2020-04-22 22:04:20.000000000 +0200 ++++ icu/source/common/dictionarydata.h 2020-05-11 18:50:43.704113746 +0200 +@@ -21,6 +21,7 @@ + #include "unicode/utext.h" + #include "unicode/udata.h" + #include "udataswp.h" ++#include "unicode/uniset.h" + #include "unicode/uobject.h" + #include "unicode/ustringtrie.h" + +@@ -92,7 +93,7 @@ + */ + virtual int32_t matches(UText *text, int32_t maxLength, int32_t limit, + int32_t *lengths, int32_t *cpLengths, int32_t *values, +- int32_t *prefix) const = 0; ++ int32_t *prefix, UnicodeSet const* ignoreSet = NULL, int32_t minLength = 0) const = 0; + + /** @return DictionaryData::TRIE_TYPE_XYZ */ + virtual int32_t getType() const = 0; +@@ -107,7 +108,7 @@ + virtual ~UCharsDictionaryMatcher(); + virtual int32_t matches(UText *text, int32_t maxLength, int32_t limit, + int32_t *lengths, int32_t *cpLengths, int32_t *values, +- int32_t *prefix) const; ++ int32_t *prefix, UnicodeSet const* ignoreSet = NULL, int32_t minLength = 0) const; + virtual int32_t getType() const; + private: + const UChar *characters; +@@ -125,7 +126,7 @@ + virtual ~BytesDictionaryMatcher(); + virtual int32_t matches(UText *text, int32_t maxLength, int32_t limit, + int32_t *lengths, int32_t *cpLengths, int32_t *values, +- int32_t *prefix) const; ++ int32_t *prefix, UnicodeSet const* ignoreSet = NULL, int32_t minLength = 0) const; + virtual int32_t getType() const; + private: + UChar32 transform(UChar32 c) const; diff --git a/external/icu/icu4c-macosx.patch.1 b/external/icu/icu4c-macosx.patch.1 new file mode 100644 index 000000000..fee08eb05 --- /dev/null +++ b/external/icu/icu4c-macosx.patch.1 @@ -0,0 +1,20 @@ +diff -ur icu.org/source/common/putil.cpp icu/source/common/putil.cpp +--- icu.org/source/common/putil.cpp 2017-04-10 16:22:16.000000000 +0200 ++++ icu/source/common/putil.cpp 2017-04-21 22:14:09.940217733 +0200 +@@ -1198,8 +1198,16 @@ + static const time_t decemberSolstice=1198332540; /*2007-12-22 06:09 UT*/ + + /* This probing will tell us when daylight savings occurs. */ ++#if U_PLATFORM_IS_DARWIN_BASED ++ struct tm *tmp; ++ tmp = localtime(&juneSolstice); ++ juneSol = *tmp; ++ tmp = localtime(&decemberSolstice); ++ decemberSol = *tmp; ++#else + localtime_r(&juneSolstice, &juneSol); + localtime_r(&decemberSolstice, &decemberSol); ++#endif + if(decemberSol.tm_isdst > 0) { + daylightType = U_DAYLIGHT_DECEMBER; + } else if(juneSol.tm_isdst > 0) { diff --git a/external/icu/icu4c-mkdir.patch.1 b/external/icu/icu4c-mkdir.patch.1 new file mode 100644 index 000000000..112e57cc2 --- /dev/null +++ b/external/icu/icu4c-mkdir.patch.1 @@ -0,0 +1,11 @@ +diff -ur icu.org/source/data/Makefile.in icu/source/data/Makefile.in +--- icu.org/source/data/Makefile.in 2019-04-17 21:42:15.000000000 +0200 ++++ icu/source/data/Makefile.in 2019-10-28 12:57:15.033649494 +0100 +@@ -226,6 +226,7 @@ + ifeq ($(PKGDATA_MODE),dll) + SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res + $(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc ++ mkdir -p $(OUTTMPDIR) + ifeq ($(MSYS_RC_MODE),1) + rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $< + else diff --git a/external/icu/icu4c-rpath.patch.1 b/external/icu/icu4c-rpath.patch.1 new file mode 100644 index 000000000..35a545778 --- /dev/null +++ b/external/icu/icu4c-rpath.patch.1 @@ -0,0 +1,36 @@ +diff -ur icu.org/source/config/mh-linux icu/source/config/mh-linux +--- icu.org/source/config/mh-linux 2016-06-15 20:58:17.000000000 +0200 ++++ icu/source/config/mh-linux 2017-04-21 22:38:18.893927819 +0200 +@@ -22,6 +22,10 @@ + LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN + LD_RPATH_PRE = -Wl,-rpath, + ++## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH: ++ENABLE_RPATH=YES ++RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN' ++ + ## These are the library specific LDFLAGS + LDFLAGSICUDT=-nodefaultlibs -nostdlib + +diff -ur icu.org/source/data/pkgdataMakefile.in icu/source/data/pkgdataMakefile.in +--- icu.org/source/data/pkgdataMakefile.in 2016-06-15 20:58:17.000000000 +0200 ++++ icu/source/data/pkgdataMakefile.in 2017-04-21 22:38:18.892927822 +0200 +@@ -18,6 +18,9 @@ + MIDDLE_SO_TARGET= + PKGDATA_TRAILING_SPACE=" " + ++# escape $ with \ when passing to echo; needed to preserve $ORIGIN ++SHLIB.c.shell := $(subst $$,\$$,$(SHLIB.c)) ++ + all : clean + @echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE) + @echo SO=$(SO) >> $(OUTPUTFILE) +@@ -26,7 +29,7 @@ + @echo LIB_EXT_ORDER=$(FINAL_SO_TARGET) >> $(OUTPUTFILE) + @echo COMPILE="$(COMPILE.c)" >> $(OUTPUTFILE) + @echo LIBFLAGS="-I$(top_srcdir)/common -I$(top_builddir)/common $(SHAREDLIBCPPFLAGS) $(SHAREDLIBCFLAGS)" >> $(OUTPUTFILE) +- @echo GENLIB="$(SHLIB.c)" >> $(OUTPUTFILE) ++ @echo GENLIB="$(SHLIB.c.shell)" >> $(OUTPUTFILE) + @echo LDICUDTFLAGS=$(LDFLAGSICUDT) >> $(OUTPUTFILE) + @echo LD_SONAME=$(LD_SONAME) >> $(OUTPUTFILE) + @echo RPATH_FLAGS=$(RPATH_FLAGS) >> $(OUTPUTFILE) diff --git a/external/icu/icu4c-rtti.patch.1 b/external/icu/icu4c-rtti.patch.1 new file mode 100644 index 000000000..c058c7f3c --- /dev/null +++ b/external/icu/icu4c-rtti.patch.1 @@ -0,0 +1,12 @@ +diff -ur icu.org/source/config/mh-linux icu/source/config/mh-linux +--- icu.org/source/config/mh-linux 2017-04-21 23:01:23.257769703 +0200 ++++ icu/source/config/mh-linux 2017-04-21 23:03:23.166481552 +0200 +@@ -36,7 +36,7 @@ + #SH# LD_SONAME= + + ## Shared library options +-LD_SOOPTIONS= -Wl,-Bsymbolic ++LD_SOOPTIONS= -Wl,-Bsymbolic-functions + + ## Shared object suffix + SO = so diff --git a/external/icu/icu4c-scriptrun.patch.1 b/external/icu/icu4c-scriptrun.patch.1 new file mode 100644 index 000000000..f2f2cf9f3 --- /dev/null +++ b/external/icu/icu4c-scriptrun.patch.1 @@ -0,0 +1,60 @@ +diff -ur icu.org/source/extra/scrptrun/scrptrun.cpp icu/source/extra/scrptrun/scrptrun.cpp +--- icu.org/source/extra/scrptrun/scrptrun.cpp 2017-01-20 01:20:31.000000000 +0100 ++++ icu/source/extra/scrptrun/scrptrun.cpp 2017-04-21 22:59:31.708037770 +0200 +@@ -151,7 +151,11 @@ + // characters above it on the stack will be poped. + if (pairIndex >= 0) { + if ((pairIndex & 1) == 0) { +- parenStack[++parenSP].pairIndex = pairIndex; ++ ++parenSP; ++ int32_t nVecSize = parenStack.size(); ++ if (parenSP == nVecSize) ++ parenStack.resize(nVecSize + 128); ++ parenStack[parenSP].pairIndex = pairIndex; + parenStack[parenSP].scriptCode = scriptCode; + } else if (parenSP >= 0) { + int32_t pi = pairIndex & ~1; +@@ -185,7 +189,14 @@ + // pop it from the stack + if (pairIndex >= 0 && (pairIndex & 1) != 0 && parenSP >= 0) { + parenSP -= 1; +- startSP -= 1; ++ /* decrement startSP only if it is >= 0, ++ decrementing it unnecessarily will lead to memory corruption ++ while processing the above while block. ++ e.g. startSP = -4 , parenSP = -1 ++ */ ++ if (startSP >= 0) { ++ startSP -= 1; ++ } + } + } else { + // if the run broke on a surrogate pair, +diff -ur icu.org/source/extra/scrptrun/scrptrun.h icu/source/extra/scrptrun/scrptrun.h +--- icu.org/source/extra/scrptrun/scrptrun.h 2017-01-20 01:20:31.000000000 +0100 ++++ icu/source/extra/scrptrun/scrptrun.h 2017-04-21 22:59:31.708037770 +0200 +@@ -19,6 +19,7 @@ + #include "unicode/utypes.h" + #include "unicode/uobject.h" + #include "unicode/uscript.h" ++#include <vector> + + U_NAMESPACE_BEGIN + +@@ -81,7 +82,7 @@ + int32_t scriptEnd; + UScriptCode scriptCode; + +- ParenStackEntry parenStack[128]; ++ std::vector<ParenStackEntry> parenStack; + int32_t parenSP; + + static int8_t highBit(int32_t value); +@@ -135,6 +136,7 @@ + scriptEnd = charStart; + scriptCode = USCRIPT_INVALID_CODE; + parenSP = -1; ++ parenStack.resize(128); + } + + inline void ScriptRun::reset(int32_t start, int32_t length) diff --git a/external/icu/icu4c-solarisgcc.patch.1 b/external/icu/icu4c-solarisgcc.patch.1 new file mode 100644 index 000000000..6000ed0cb --- /dev/null +++ b/external/icu/icu4c-solarisgcc.patch.1 @@ -0,0 +1,12 @@ +diff -ur icu.org/source/common/uposixdefs.h icu/source/common/uposixdefs.h +--- icu.org/source/common/uposixdefs.h 2017-03-09 03:12:45.000000000 +0100 ++++ icu/source/common/uposixdefs.h 2017-04-21 22:23:11.857926971 +0200 +@@ -54,7 +54,7 @@ + * + * z/OS needs this definition for timeval and to get usleep. + */ +-#if !defined(_XOPEN_SOURCE_EXTENDED) && defined(__TOS_MVS__) ++#if !defined(_XOPEN_SOURCE_EXTENDED) && (defined(__TOS_MVS__) || defined(__IBMC__) || defined(__IBMCPP__)) + # define _XOPEN_SOURCE_EXTENDED 1 + #endif + diff --git a/external/icu/icu4c-ubsan.patch.1 b/external/icu/icu4c-ubsan.patch.1 new file mode 100644 index 000000000..7b0c2efc9 --- /dev/null +++ b/external/icu/icu4c-ubsan.patch.1 @@ -0,0 +1,14 @@ +diff -ur icu.org/source/common/ubidiimp.h icu/source/common/ubidiimp.h +--- icu.org/source/common/ubidiimp.h 2019-10-03 13:16:41.000000000 +0200 ++++ icu/source/common/ubidiimp.h 2019-10-28 19:08:13.533284618 +0100 +@@ -198,8 +198,8 @@ + /* in a Run, logicalStart will get this bit set if the run level is odd */ + #define INDEX_ODD_BIT (1UL<<31) + +-#define MAKE_INDEX_ODD_PAIR(index, level) ((index)|((int32_t)((level)&1)<<31)) +-#define ADD_ODD_BIT_FROM_LEVEL(x, level) ((x)|=((int32_t)((level)&1)<<31)) ++#define MAKE_INDEX_ODD_PAIR(index, level) ((index)|((uint32_t)((level)&1)<<31)) ++#define ADD_ODD_BIT_FROM_LEVEL(x, level) ((x)|=((uint32_t)((level)&1)<<31)) + #define REMOVE_ODD_BIT(x) ((x)&=~INDEX_ODD_BIT) + + #define GET_INDEX(x) ((x)&~INDEX_ODD_BIT) diff --git a/external/icu/icu4c-warnings.patch.1 b/external/icu/icu4c-warnings.patch.1 new file mode 100644 index 000000000..76f8b7298 --- /dev/null +++ b/external/icu/icu4c-warnings.patch.1 @@ -0,0 +1,11 @@ +diff -ur icu.org/source/common/unicode/utf16.h icu/source/common/unicode/utf16.h +--- icu.org/source/common/unicode/utf16.h 2019-10-03 13:16:41.000000000 +0200 ++++ icu/source/common/unicode/utf16.h 2019-10-28 18:03:07.967208272 +0100 +@@ -397,6 +397,7 @@ + (s)[(i)++]=(uint16_t)(((c)&0x3ff)|0xdc00); \ + } else /* c>0x10ffff or not enough space */ { \ + (isError)=TRUE; \ ++ (void)(isError); \ + } \ + } UPRV_BLOCK_MACRO_END + diff --git a/external/icu/khmerdict.dict b/external/icu/khmerdict.dict Binary files differnew file mode 100644 index 000000000..52605b654 --- /dev/null +++ b/external/icu/khmerdict.dict diff --git a/external/icu/ubsan.patch b/external/icu/ubsan.patch new file mode 100644 index 000000000..762bd6e5a --- /dev/null +++ b/external/icu/ubsan.patch @@ -0,0 +1,52 @@ +--- source/common/uloc.cpp ++++ source/common/uloc.cpp +@@ -1203,7 +1203,8 @@ + return 0; + } + int32_t reslen = result.length(); +- uprv_memcpy(language, result.data(), std::min(reslen, languageCapacity)); ++ auto const n = std::min(reslen, languageCapacity); ++ if (n != 0) uprv_memcpy(language, result.data(), n); + return reslen; + } + +@@ -1251,7 +1252,8 @@ + return 0; + } + int32_t reslen = result.length(); +- uprv_memcpy(script, result.data(), std::min(reslen, scriptCapacity)); ++ auto const n = std::min(reslen, scriptCapacity); ++ if (n != 0) uprv_memcpy(script, result.data(), n); + return reslen; + } + +--- source/tools/genrb/rbutil.c ++++ source/tools/genrb/rbutil.c +@@ -30,7 +30,12 @@ + get_dirname(char *dirname, + const char *filename) + { +- const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR) + 1; ++ const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR); ++ if(lastSlash == NULL) { ++ lastSlash = filename; ++ } else { ++ ++lastSlash; ++ } + + if(lastSlash>filename) { + uprv_strncpy(dirname, filename, (lastSlash - filename)); +@@ -46,7 +51,12 @@ + const char *filename) + { + /* strip off any leading directory portions */ +- const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR) + 1; ++ const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR); ++ if(lastSlash == NULL) { ++ lastSlash = filename; ++ } else { ++ ++lastSlash; ++ } + char *lastDot; + + if(lastSlash>filename) { diff --git a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk new file mode 100644 index 000000000..9b1ecf64d --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_flow_engine,$(LIBO_SHARE_JAVA_FOLDER)/flow-engine.jar,build/lib/flow-engine.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_flute.mk b/external/jfreereport/ExternalPackage_jfreereport_flute.mk new file mode 100644 index 000000000..bdc08a06b --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_flute.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flute,jfreereport_flute)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_flute,$(LIBO_SHARE_JAVA_FOLDER)/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libbase.mk b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk new file mode 100644 index 000000000..e3329d186 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libbase,jfreereport_libbase)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libbase,$(LIBO_SHARE_JAVA_FOLDER)/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk new file mode 100644 index 000000000..910f15ffb --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libfonts,jfreereport_libfonts)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libfonts,$(LIBO_SHARE_JAVA_FOLDER)/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libformula.mk b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk new file mode 100644 index 000000000..8fb9ca99e --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libformula,jfreereport_libformula)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libformula,$(LIBO_SHARE_JAVA_FOLDER)/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk new file mode 100644 index 000000000..0a5307cb8 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_liblayout,$(LIBO_SHARE_JAVA_FOLDER)/liblayout.jar,build/lib/liblayout.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libloader.mk b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk new file mode 100644 index 000000000..6cec115b8 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libloader,jfreereport_libloader)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libloader,$(LIBO_SHARE_JAVA_FOLDER)/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_librepository.mk b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk new file mode 100644 index 000000000..63662ad1b --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_librepository,jfreereport_librepository)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_librepository,$(LIBO_SHARE_JAVA_FOLDER)/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk new file mode 100644 index 000000000..f12d6882d --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libserializer,jfreereport_libserializer)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libserializer,$(LIBO_SHARE_JAVA_FOLDER)/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libxml.mk b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk new file mode 100644 index 000000000..13c207815 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libxml,jfreereport_libxml)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libxml,$(LIBO_SHARE_JAVA_FOLDER)/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_sac.mk b/external/jfreereport/ExternalPackage_jfreereport_sac.mk new file mode 100644 index 000000000..cfdf31ab6 --- /dev/null +++ b/external/jfreereport/ExternalPackage_jfreereport_sac.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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_sac,jfreereport_sac)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_sac,jfreereport_sac)) + +$(eval $(call gb_ExternalPackage_add_file,jfreereport_sac,$(LIBO_SHARE_JAVA_FOLDER)/sac.jar,build/lib/sac.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk new file mode 100644 index 000000000..ffa12623d --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -0,0 +1,42 @@ +# -*- 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,jfreereport_flow_engine)) + +$(eval $(call gb_ExternalProject_use_external_projects,jfreereport_flow_engine,\ + jfreereport_liblayout \ +)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_flow_engine,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : + $(call gb_Trace_StartRange,jfreereport_flow_engine,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(if $(SYSTEM_APACHE_COMMONS),\ + -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ + -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-$(COMMONS_LOGGING_VERSION).jar") \ + -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ + -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ + -Dliblayout.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)/build/lib/liblayout.jar \ + -Dlibloader.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)/dist/libloader-$(LIBLOADER_VERSION).jar \ + -Dlibserializer.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar \ + -Dlibxml.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + $(call gb_Trace_EndRange,jfreereport_flow_engine,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_flute.mk b/external/jfreereport/ExternalProject_jfreereport_flute.mk new file mode 100644 index 000000000..a9cb63819 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_flute.mk @@ -0,0 +1,35 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_flute,build) : + $(call gb_Trace_StartRange,jfreereport_flute,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(FLUTE_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + $(call gb_Trace_EndRange,jfreereport_flute,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libbase.mk b/external/jfreereport/ExternalProject_jfreereport_libbase.mk new file mode 100644 index 000000000..2e236d192 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libbase.mk @@ -0,0 +1,35 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) : + $(call gb_Trace_StartRange,jfreereport_libbase,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBBASE_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + $(call gb_Trace_EndRange,jfreereport_libbase,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk new file mode 100644 index 000000000..b14644c80 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk @@ -0,0 +1,35 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) : + $(call gb_Trace_StartRange,jfreereport_libfonts,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBFONTS_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + $(call gb_Trace_EndRange,jfreereport_libfonts,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libformula.mk b/external/jfreereport/ExternalProject_jfreereport_libformula.mk new file mode 100644 index 000000000..95c650e8f --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libformula.mk @@ -0,0 +1,35 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) : + $(call gb_Trace_StartRange,jfreereport_libformula,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBFORMULA_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + $(call gb_Trace_EndRange,jfreereport_libformula,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk new file mode 100644 index 000000000..519368c2b --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -0,0 +1,59 @@ +# -*- 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,jfreereport_liblayout)) + +$(eval $(call gb_ExternalProject_use_externals,jfreereport_liblayout,\ + commons-logging \ +)) + +$(eval $(call gb_ExternalProject_use_external_projects,jfreereport_liblayout,\ + jfreereport_sac \ + jfreereport_libbase \ + jfreereport_flute \ + jfreereport_libloader \ + jfreereport_libxml \ + jfreereport_libformula \ + jfreereport_libfonts \ + jfreereport_librepository \ + jfreereport_libserializer \ +)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : + $(call gb_Trace_StartRange,jfreereport_liblayout,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(if $(SYSTEM_APACHE_COMMONS),\ + -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ + -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-$(COMMONS_LOGGING_VERSION).jar") \ + -Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \ + -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ + -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ + -Dlibfonts.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts)/dist/libfonts-$(LIBFONTS_VERSION).jar \ + -Dlibloader.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)/dist/libloader-$(LIBLOADER_VERSION).jar \ + -Dlibrepository.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_librepository)/dist/librepository-$(LIBREPOSITORY_VERSION).jar \ + -Dlibserializer.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar \ + -Dlibxml.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar \ + -Dsac.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_sac)/build/lib/sac.jar \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + $(call gb_Trace_EndRange,jfreereport_liblayout,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libloader.mk b/external/jfreereport/ExternalProject_jfreereport_libloader.mk new file mode 100644 index 000000000..2b37d9a22 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libloader.mk @@ -0,0 +1,35 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) : + $(call gb_Trace_StartRange,jfreereport_libloader,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBLOADER_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + $(call gb_Trace_EndRange,jfreereport_libloader,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_librepository.mk b/external/jfreereport/ExternalProject_jfreereport_librepository.mk new file mode 100644 index 000000000..e95610b85 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_librepository.mk @@ -0,0 +1,35 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) : + $(call gb_Trace_StartRange,jfreereport_librepository,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBREPOSITORY_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + $(call gb_Trace_EndRange,jfreereport_librepository,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk new file mode 100644 index 000000000..34614fb08 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk @@ -0,0 +1,35 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) : + $(call gb_Trace_StartRange,jfreereport_libserializer,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)." \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBSERIALIZER_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + $(call gb_Trace_EndRange,jfreereport_libserializer,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libxml.mk b/external/jfreereport/ExternalProject_jfreereport_libxml.mk new file mode 100644 index 000000000..478a75747 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_libxml.mk @@ -0,0 +1,35 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) : + $(call gb_Trace_StartRange,jfreereport_libxml,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dantcontrib.available="true" \ + -Dbuild.id="10682" \ + -Dproject.revision="$(LIBXML_VERSION)" \ + $(if $(debug),-Dbuild.debug="on") jar \ + ) + $(call gb_Trace_EndRange,jfreereport_libxml,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_sac.mk b/external/jfreereport/ExternalProject_jfreereport_sac.mk new file mode 100644 index 000000000..b78d8a970 --- /dev/null +++ b/external/jfreereport/ExternalProject_jfreereport_sac.mk @@ -0,0 +1,30 @@ +# -*- 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,jfreereport_sac)) + +$(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,jfreereport_sac,build) : + $(call gb_Trace_StartRange,jfreereport_sac,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + -Dantcontrib.available="true" \ + $(if $(debug),-Dbuild.debug="on") all \ + ) + $(call gb_Trace_EndRange,jfreereport_sac,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/Makefile b/external/jfreereport/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/jfreereport/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/jfreereport/Module_jfreereport.mk b/external/jfreereport/Module_jfreereport.mk new file mode 100644 index 000000000..5a4431ecc --- /dev/null +++ b/external/jfreereport/Module_jfreereport.mk @@ -0,0 +1,48 @@ +# -*- 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,jfreereport)) + +$(eval $(call gb_Module_add_targets,jfreereport,\ + ExternalPackage_jfreereport_flow_engine \ + ExternalPackage_jfreereport_flute \ + ExternalPackage_jfreereport_libbase \ + ExternalPackage_jfreereport_libfonts \ + ExternalPackage_jfreereport_libformula \ + ExternalPackage_jfreereport_liblayout \ + ExternalPackage_jfreereport_libloader \ + ExternalPackage_jfreereport_librepository \ + ExternalPackage_jfreereport_libserializer \ + ExternalPackage_jfreereport_libxml \ + ExternalPackage_jfreereport_sac \ + ExternalProject_jfreereport_flow_engine \ + ExternalProject_jfreereport_flute \ + ExternalProject_jfreereport_libbase \ + ExternalProject_jfreereport_libfonts \ + ExternalProject_jfreereport_libformula \ + ExternalProject_jfreereport_liblayout \ + ExternalProject_jfreereport_libloader \ + ExternalProject_jfreereport_librepository \ + ExternalProject_jfreereport_libserializer \ + ExternalProject_jfreereport_libxml \ + ExternalProject_jfreereport_sac \ + UnpackedTarball_jfreereport_flow_engine \ + UnpackedTarball_jfreereport_flute \ + UnpackedTarball_jfreereport_libbase \ + UnpackedTarball_jfreereport_libfonts \ + UnpackedTarball_jfreereport_libformula \ + UnpackedTarball_jfreereport_liblayout \ + UnpackedTarball_jfreereport_libloader \ + UnpackedTarball_jfreereport_librepository \ + UnpackedTarball_jfreereport_libserializer \ + UnpackedTarball_jfreereport_libxml \ + UnpackedTarball_jfreereport_sac \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/README b/external/jfreereport/README new file mode 100644 index 000000000..228577060 --- /dev/null +++ b/external/jfreereport/README @@ -0,0 +1 @@ +Java library providing basic functionality for the report builder, from [http://www.object-refinery.com/jfreereport/] diff --git a/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk new file mode 100644 index 000000000..e0d309ab2 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk @@ -0,0 +1,23 @@ +# -*- 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,jfreereport_flow_engine)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_flow_engine,$(JFREEREPORT_FLOW_ENGINE_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\ + build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flow_engine,\ + external/jfreereport/patches/flow-engine.patch \ + external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_flute.mk b/external/jfreereport/UnpackedTarball_jfreereport_flute.mk new file mode 100644 index 000000000..a972e21aa --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_flute.mk @@ -0,0 +1,22 @@ +# -*- 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,jfreereport_flute)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_flute,$(JFREEREPORT_FLUTE_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flute,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flute,\ + external/jfreereport/patches/common_build.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk b/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk new file mode 100644 index 000000000..c3ba35190 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libbase.mk @@ -0,0 +1,26 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libbase)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libbase,$(JFREEREPORT_LIBBASE_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libbase,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libbase,\ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libbase-$(LIBBASE_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk b/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk new file mode 100644 index 000000000..b648c58bb --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libfonts.mk @@ -0,0 +1,26 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libfonts)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libfonts,$(JFREEREPORT_LIBFONTS_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libfonts,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libfonts,\ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libfonts-$(LIBFONTS_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk new file mode 100644 index 000000000..596229668 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk @@ -0,0 +1,26 @@ +# -*- 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,jfreereport_libformula)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libformula,$(JFREEREPORT_LIBFORMULA_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libformula,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libformula-time-notz.patch \ + external/jfreereport/patches/libformula-seconds_rounding.patch.1 \ + external/jfreereport/patches/libformula-minutes_truncation.patch.1 \ + external/jfreereport/patches/libformula-datevalue_truncation.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk b/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk new file mode 100644 index 000000000..7281ba59b --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_liblayout.mk @@ -0,0 +1,22 @@ +# -*- 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,jfreereport_liblayout)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_liblayout,$(JFREEREPORT_LIBLAYOUT_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_liblayout,\ + build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_liblayout,\ + external/jfreereport/patches/liblayout.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk b/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk new file mode 100644 index 000000000..7357ddd03 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libloader.mk @@ -0,0 +1,26 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_libloader)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libloader,$(JFREEREPORT_LIBLOADER_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libloader,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libloader,\ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/libloader-$(LIBLOADER_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk b/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk new file mode 100644 index 000000000..86ff991b9 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_librepository.mk @@ -0,0 +1,26 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/external/jfreereport/version.mk + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_librepository)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_librepository,$(JFREEREPORT_LIBREPOSITORY_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_librepository,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_librepository,\ + external/jfreereport/patches/common_build.patch \ + external/jfreereport/patches/librepository-$(LIBREPOSITORY_VERSION)-deprecated.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk b/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk new file mode 100644 index 000000000..22d6d0cb7 --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libserializer.mk @@ -0,0 +1,22 @@ +# -*- 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,jfreereport_libserializer)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libserializer,$(JFREEREPORT_LIBSERIALIZER_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libserializer,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libserializer,\ + external/jfreereport/patches/common_build.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk b/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk new file mode 100644 index 000000000..ceca692ad --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_libxml.mk @@ -0,0 +1,22 @@ +# -*- 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,jfreereport_libxml)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_libxml,$(JFREEREPORT_LIBXML_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_libxml,\ + common_build.xml \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libxml,\ + external/jfreereport/patches/common_build.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_sac.mk b/external/jfreereport/UnpackedTarball_jfreereport_sac.mk new file mode 100644 index 000000000..eb951663d --- /dev/null +++ b/external/jfreereport/UnpackedTarball_jfreereport_sac.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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,jfreereport_sac)) + +$(eval $(call gb_UnpackedTarball_set_tarball,jfreereport_sac,$(JFREEREPORT_SAC_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_file,jfreereport_sac,build.xml,external/jfreereport/java/sac/build.xml)) + +# vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/java/sac/build.xml b/external/jfreereport/java/sac/build.xml new file mode 100644 index 000000000..0e85dff04 --- /dev/null +++ b/external/jfreereport/java/sac/build.xml @@ -0,0 +1,64 @@ +<project name="sac" default="all" basedir="."> + + <!-- Properties --> + + <property name="name" value="sac"/> + <property name="src" value="src"/> + <property name="build" value="build"/> + <property name="build.classes" value="${build}/classes"/> + <property name="build.doc" value="${build}/api"/> + <property name="build.lib" value="${build}/lib"/> + <property name="packagenames" value="org.w3c.css.sac.*"/> + + <!-- Targets --> + + <!-- Prepare build directories --> + <target name="prepare"> + <mkdir dir="${src}"/> + <mkdir dir="${build}"/> + <mkdir dir="${build.classes}"/> + <mkdir dir="${build.lib}"/> + <mkdir dir="${build.doc}"/> + <copy todir="${src}/org"> + <fileset dir="org"/> + </copy> + </target> + + <!-- Kill all the created directories --> + <target name="clean"> + <delete dir="${build}"/> + <delete dir="${src}"/> + </target> + + <!-- Build classes --> + <target name="classes" depends="prepare"> + <javac srcdir="${src}" destdir="${build.classes}" debug="off" optimize="on"/> + <copy todir="${build.classes}"> + <fileset dir="${src}"> + <include name="**/*.properties"/> + </fileset> + </copy> + </target> + + <!-- Build jar archives --> + <target name="jar" depends="classes"> + <jar jarfile="${build.lib}/${name}.jar" basedir="${build.classes}"/> + </target> + + <!-- Build the full JavaDocs --> + <target name="javadoc" depends="prepare"> + <javadoc sourcepath="${src}" + destdir="${build.doc}" + doctitle="${name} JavaDoc" + windowtitle="${name} JavaDoc" + package="true" + author="true" + version="true" + packagenames="${packagenames}" + /> + </target> + + <!-- Build everything --> + <target name="all" depends="jar,javadoc"/> + +</project>
\ No newline at end of file diff --git a/external/jfreereport/nbprojects/flute/nbproject/project.xml b/external/jfreereport/nbprojects/flute/nbproject/project.xml new file mode 100644 index 000000000..4280b9102 --- /dev/null +++ b/external/jfreereport/nbprojects/flute/nbproject/project.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>flute-13a</name> + <properties> + <property name="project.dir">../../wntmsci10/misc/build/flute</property> + <property name="ant.script">${project.dir}/ant/build.xml</property> + </properties> + <folders> + <source-folder> + <label>flute</label> + <location>${project.dir}</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>all</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <location>${ant.script}</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="javadoc"/> + </context-menu> + </view> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/> + </configuration> +</project> diff --git a/external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml b/external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml new file mode 100644 index 000000000..f7a14ae87 --- /dev/null +++ b/external/jfreereport/nbprojects/jcommon-serializer/nbproject/project.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>jcommon-serializer</name> + <properties> + <property name="project.dir">../../wntmsci10/misc/build/jcommon-serializer</property> + <property name="ant.script">${project.dir}/ant/build.xml</property> + </properties> + <folders> + <source-folder> + <label>jcommon-serializer</label> + <location>${project.dir}</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>all</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <location>${ant.script}</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="javadoc"/> + </context-menu> + </view> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/> + </configuration> +</project> diff --git a/external/jfreereport/nbprojects/jfreereport/nbproject/project.xml b/external/jfreereport/nbprojects/jfreereport/nbproject/project.xml new file mode 100644 index 000000000..8f6074cfb --- /dev/null +++ b/external/jfreereport/nbprojects/jfreereport/nbproject/project.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>jfreereport</name> + <properties> + <property name="project.dir">../../wntmsci10/misc/build/jfreereport</property> + <property name="ant.script">${project.dir}/ant/build.xml</property> + </properties> + <folders> + <source-folder> + <label>jfreereport</label> + <location>${project.dir}</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>all</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <location>${ant.script}</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="javadoc"/> + </context-menu> + </view> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/> + </configuration> +</project> diff --git a/external/jfreereport/nbprojects/libfonts/nbproject/project.xml b/external/jfreereport/nbprojects/libfonts/nbproject/project.xml new file mode 100644 index 000000000..d84bfb7f8 --- /dev/null +++ b/external/jfreereport/nbprojects/libfonts/nbproject/project.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>libfonts</name> + <properties> + <property name="project.dir">../../wntmsci10/misc/build/libfonts</property> + <property name="ant.script">${project.dir}/ant/build.xml</property> + </properties> + <folders> + <source-folder> + <label>libfonts</label> + <location>${project.dir}</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>all</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <location>${ant.script}</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="javadoc"/> + </context-menu> + </view> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/> + </configuration> +</project> diff --git a/external/jfreereport/nbprojects/libformula/nbproject/project.xml b/external/jfreereport/nbprojects/libformula/nbproject/project.xml new file mode 100644 index 000000000..e056200ee --- /dev/null +++ b/external/jfreereport/nbprojects/libformula/nbproject/project.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>libformula</name> + <properties> + <property name="project.dir">../../wntmsci10/misc/build/libformula</property> + <property name="ant.script">${project.dir}/ant/build.xml</property> + </properties> + <folders> + <source-folder> + <label>libformula</label> + <location>${project.dir}</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>all</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <location>${ant.script}</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="javadoc"/> + </context-menu> + </view> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/> + </configuration> +</project> diff --git a/external/jfreereport/nbprojects/liblayout/nbproject/project.xml b/external/jfreereport/nbprojects/liblayout/nbproject/project.xml new file mode 100644 index 000000000..63ad9ef3f --- /dev/null +++ b/external/jfreereport/nbprojects/liblayout/nbproject/project.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>liblayout</name> + <properties> + <property name="project.dir">../../wntmsci10/misc/build/liblayout</property> + <property name="ant.script">${project.dir}/ant/build.xml</property> + </properties> + <folders> + <source-folder> + <label>liblayout</label> + <location>${project.dir}</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>all</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <location>${ant.script}</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="javadoc"/> + </context-menu> + </view> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/> + </configuration> +</project> diff --git a/external/jfreereport/nbprojects/libloader/nbproject/project.xml b/external/jfreereport/nbprojects/libloader/nbproject/project.xml new file mode 100644 index 000000000..6b06d5686 --- /dev/null +++ b/external/jfreereport/nbprojects/libloader/nbproject/project.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>libloader</name> + <properties> + <property name="project.dir">../../wntmsci10/misc/build/libloader</property> + <property name="ant.script">${project.dir}/ant/build.xml</property> + </properties> + <folders> + <source-folder> + <label>libloader</label> + <location>${project.dir}</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>all</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <location>${ant.script}</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="javadoc"/> + </context-menu> + </view> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/> + </configuration> +</project> diff --git a/external/jfreereport/nbprojects/librepository/nbproject/project.xml b/external/jfreereport/nbprojects/librepository/nbproject/project.xml new file mode 100644 index 000000000..c1b92593d --- /dev/null +++ b/external/jfreereport/nbprojects/librepository/nbproject/project.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>librepository</name> + <properties> + <property name="project.dir">../../wntmsci10/misc/build/librepository</property> + <property name="ant.script">${project.dir}/ant/build.xml</property> + </properties> + <folders> + <source-folder> + <label>librepository</label> + <location>${project.dir}</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>all</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <location>${ant.script}</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="javadoc"/> + </context-menu> + </view> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/> + </configuration> +</project> diff --git a/external/jfreereport/nbprojects/libxml/nbproject/project.xml b/external/jfreereport/nbprojects/libxml/nbproject/project.xml new file mode 100644 index 000000000..6b966c904 --- /dev/null +++ b/external/jfreereport/nbprojects/libxml/nbproject/project.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>libxml</name> + <properties> + <property name="project.dir">../../wntmsci10/misc/build/libxml</property> + <property name="ant.script">${project.dir}/ant/build.xml</property> + </properties> + <folders> + <source-folder> + <label>libxml</label> + <location>${project.dir}</location> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>all</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + </ide-actions> + <view> + <items> + <source-file> + <location>${ant.script}</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="javadoc"/> + </context-menu> + </view> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/> + </configuration> +</project> diff --git a/external/jfreereport/patches/common_build.patch b/external/jfreereport/patches/common_build.patch new file mode 100644 index 000000000..b197f494e --- /dev/null +++ b/external/jfreereport/patches/common_build.patch @@ -0,0 +1,119 @@ +--- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100 ++++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100 +@@ -136,8 +136,6 @@ + <property name="javac.deprecation" + value="true" + description="Indicates whether source should be compiled with deprecation information" /> +- <property name="javac.source" value="1.5" description="Provide source compatibility with specified release" /> +- <property name="javac.target" value="1.5" description="Generate class files for specific VM version" /> + + <!-- Build Cache properties --> + <property name="build.cache.dir" +@@ -261,7 +261,7 @@ TYPICAL TARGET SEQUENCE + <property name="project.revision" value="${Implementation-Version}" description="Sets the version number of the project based on the Implementation-Version found in the manifest file (if one is supplied and nothing is specified in the build.properties)" /> + <fail message="A project revision number has not been determined!"> + <condition> +- <matches string="${project.revision}" pattern="\$\{.*\}" /> ++ <contains string="${project.revision}" substring="\$\{" /> + </condition> + </fail> + +@@ -270,7 +270,7 @@ TYPICAL TARGET SEQUENCE + <property name="impl.title" value="${Implementation-Title}" description="Sets the title of the project based on the Implementation-Title found in the manifest file (if one is supplied and nothing is specified in the build.properties)" /> + <fail message="A project title has not been determined!"> + <condition> +- <matches string="${impl.title}" pattern="\$\{.*\}" /> ++ <contains string="${impl.title}" substring="\$\{" /> + </condition> + </fail> + +@@ -497,7 +497,7 @@ + Sets a property build.id to the either "development" or the svn revision + if in release mode + ====================================================================--> +- <target name="set-build.id" unless="build.id" depends="install-antcontrib"> ++ <target name="set-build.id" unless="build.id" > + <if> + <istrue value="${release}" /> + <then> +@@ -1061,12 +1061,17 @@ + Performs the actual compile + ====================================================================--> + <target name="compile.compile" depends="init"> ++ <copy todir="${classes.dir}"> ++ <fileset dir="source"> ++ <include name="**/*.properties"/> ++ </fileset> ++ </copy> + <javac destdir="${classes.dir}" + debug="${javac.debug}" + deprecation="${javac.deprecation}" + fork="true" +- source="${javac.source}" +- target="${javac.target}"> ++ source="${ant.build.javac.source}" ++ target="${ant.build.javac.target}"> + <classpath> + <path refid="classpath" /> + </classpath> +@@ -1082,27 +1087,32 @@ + duplicate copying of resources from src tree (handled by compile.src_copy + if jar.include.source is set. + ====================================================================--> +- <target name="compile.res_copy" depends="install-antcontrib"> +- <if> +- <available file="${res.dir}" /> +- <then> +- <copy todir="${classes.dir}"> +- <fileset dir="${res.dir}" /> +- </copy> +- </then> +- </if> ++ <target name="compile.res_copy" > ++ <condition property="copy.res.available"> ++ <available file="$(res.dir)" type="dir" /> ++ </condition> ++ <antcall target="copy.res" /> + +- <if> +- <not> +- <isset property="jar.include.source" /> +- </not> +- <then> +- <copy todir="${classes.dir}" flatten="false"> +- <fileset dir="${src.dir}" excludes="**/*.java" /> +- </copy> +- </then> +- </if> +- </target> ++ <condition property="copy.res.class.available"> ++ <not> ++ <isset property="jar.include.source" /> ++ </not> ++ </condition> ++ <antcall target="copy.res.class" /> ++ </target> ++ ++ <target name="copy.res" if="copy.res.available" > ++ <copy todir="${classes.dir}"> ++ <fileset dir="${res.dir}"/> ++ </copy> ++ </target> ++ ++ <target name="copy.res.class" if="copy.res.class.available" > ++ <uptodate targetfile="${classes.dir}" property="s"> ++ <srcfiles dir= "${src.dir}" excludes="**/*.java" /> ++ <flattenmapper/> ++ </uptodate> ++ </target> + + + <!--======================================================================= +@@ -1167,7 +1177,6 @@ + <target name="generate.manifest" depends="init,set-build.id"> + <delete file="${dist.manifest.file}" /> + <touch file="${dist.manifest.file}" /> +- <copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" /> + + <manifest file="${dist.manifest.file}" mode="update"> + <attribute name="Implementation-Title" value="${impl.title}" /> diff --git a/external/jfreereport/patches/flow-engine.patch b/external/jfreereport/patches/flow-engine.patch new file mode 100644 index 000000000..63f0dbda0 --- /dev/null +++ b/external/jfreereport/patches/flow-engine.patch @@ -0,0 +1,19 @@ +--- misc/flow-engine-0.9.4/build.xml (Revision 6728) ++++ misc/build/flow-engine-0.9.4/build.xml (Arbeitskopie) +@@ -24,9 +24,13 @@ + + <!-- Setup the compile classpath --> + <path id="classpath"> +- <fileset dir="lib"> +- <include name="*.jar" /> +- </fileset> ++ <pathelement path="${commons-logging.jar}"/> ++ <pathelement path="${libbase.jar}"/> ++ <pathelement path="${libformula.jar}"/> ++ <pathelement path="${liblayout.jar}"/> ++ <pathelement path="${libloader.jar}"/> ++ <pathelement path="${libserializer.jar}"/> ++ <pathelement path="${libxml.jar}"/> + </path> + + <!-- Kill all the created directories --> diff --git a/external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 b/external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 new file mode 100644 index 000000000..3ed23ee58 --- /dev/null +++ b/external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 @@ -0,0 +1,13 @@ +diff -ur jfreereport_flow_engine.org/source/org/jfree/report/expressions/ReportFormulaContext.java jfreereport_flow_engine/source/org/jfree/report/expressions/ReportFormulaContext.java +--- jfreereport_flow_engine.org/source/org/jfree/report/expressions/ReportFormulaContext.java 2015-07-14 17:24:51.924156060 +0200 ++++ jfreereport_flow_engine/source/org/jfree/report/expressions/ReportFormulaContext.java 2015-07-14 17:27:56.669270298 +0200 +@@ -120,7 +120,7 @@ + { + if (flags.isDate()) + { +- return DateTimeType.DATE_TYPE; ++ return DateTimeType.DATETIME_TYPE; + } + if (flags.isNumeric()) + { +Only in jfreereport_flow_engine/source/org/jfree/report/expressions: ReportFormulaContext.java~ diff --git a/external/jfreereport/patches/libbase-1.1.6-deprecated.patch b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch new file mode 100644 index 000000000..e5cd38bd8 --- /dev/null +++ b/external/jfreereport/patches/libbase-1.1.6-deprecated.patch @@ -0,0 +1,53 @@ +--- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2010-04-27 15:58:44.000000000 +0200 ++++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2011-06-13 01:28:14.000000000 +0200 +@@ -48,7 +48,7 @@ + */ + public ModuleInitializeException(final String s, final Exception e) + { +- super(s, e); ++ super(s, (Throwable) e); + } + + /** +--- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java 2010-04-27 15:58:46.000000000 +0200 ++++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java 2014-07-22 17:53:13.000000000 +0200 +@@ -173,7 +173,7 @@ + final File file = directoryOrJar.getAbsoluteFile(); + if (file.isDirectory() && file.exists() && file.canRead()) + { +- allURLs.add(file.toURL()); ++ allURLs.add(file.toURI().toURL()); + directoryURLs.add(file); + continue; + } +@@ -186,8 +186,8 @@ + final String fileName = file.getName(); + if (fileName.endsWith(".jar") || fileName.endsWith(".zip")) + { +- allURLs.add(file.toURL()); +- jarURLs.add(file.toURL()); ++ allURLs.add(file.toURI().toURL()); ++ jarURLs.add(file.toURI().toURL()); + } + } + +@@ -199,7 +199,7 @@ + final File file = driverFiles[i]; + if (file.isDirectory() && file.exists() && file.canRead()) + { +- allURLs.add(file.toURL()); ++ allURLs.add(file.toURI().toURL()); + directoryURLs.add(file); + continue; + } +@@ -212,8 +212,8 @@ + final String fileName = file.getName(); + if (fileName.endsWith(".jar") || fileName.endsWith(".zip")) + { +- allURLs.add(file.toURL()); +- jarURLs.add(file.toURL()); ++ allURLs.add(file.toURI().toURL()); ++ jarURLs.add(file.toURI().toURL()); + } + } + } diff --git a/external/jfreereport/patches/libfonts-1.1.6-deprecated.patch b/external/jfreereport/patches/libfonts-1.1.6-deprecated.patch new file mode 100644 index 000000000..eb2ab8c76 --- /dev/null +++ b/external/jfreereport/patches/libfonts-1.1.6-deprecated.patch @@ -0,0 +1,11 @@ +--- misc/libfonts-1.1.6/source/org/pentaho/reporting/libraries/fonts/FontException.java 2010-04-27 16:09:00.000000000 +0200 ++++ misc/build/libfonts-1.1.6/source/org/pentaho/reporting/libraries/fonts/FontException.java 2011-06-13 02:04:51.000000000 +0200 +@@ -39,7 +39,7 @@ + */ + public FontException(final String message, final Exception ex) + { +- super(message, ex); ++ super(message, (Throwable) ex); + } + + /** diff --git a/external/jfreereport/patches/libformula-datevalue_truncation.patch.1 b/external/jfreereport/patches/libformula-datevalue_truncation.patch.1 new file mode 100644 index 000000000..069c667c1 --- /dev/null +++ b/external/jfreereport/patches/libformula-datevalue_truncation.patch.1 @@ -0,0 +1,29 @@ +diff -ur jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java +--- jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java 2010-06-01 17:15:50.000000000 +0200 ++++ jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java 2015-07-14 17:24:42.503895240 +0200 +@@ -18,6 +18,7 @@ + package org.pentaho.reporting.libraries.formula.function.datetime; + + import java.util.Date; ++import java.util.Calendar; + + import org.pentaho.reporting.libraries.formula.EvaluationException; + import org.pentaho.reporting.libraries.formula.FormulaContext; +@@ -28,6 +29,7 @@ + import org.pentaho.reporting.libraries.formula.typing.Type; + import org.pentaho.reporting.libraries.formula.typing.TypeRegistry; + import org.pentaho.reporting.libraries.formula.typing.coretypes.DateTimeType; ++import org.pentaho.reporting.libraries.formula.util.DateUtil; + + /** + * This function returns +@@ -61,7 +63,8 @@ + final Object value = parameters.getValue(0); + + final Date date1 = typeRegistry.convertToDate(type, value); +- return new TypeValuePair(DateTimeType.DATE_TYPE, date1); ++ final Date date = DateUtil.normalizeDate(date1, DateTimeType.DATE_TYPE); + ++ return new TypeValuePair(DateTimeType.DATE_TYPE, date); + } + } diff --git a/external/jfreereport/patches/libformula-minutes_truncation.patch.1 b/external/jfreereport/patches/libformula-minutes_truncation.patch.1 new file mode 100644 index 000000000..71f0be2c9 --- /dev/null +++ b/external/jfreereport/patches/libformula-minutes_truncation.patch.1 @@ -0,0 +1,14 @@ +diff -ur jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java +--- jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java 2015-07-13 15:55:31.752539618 +0200 ++++ jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/MinuteFunction.java 2015-07-13 15:56:27.084394065 +0200 +@@ -74,7 +74,7 @@ + + // Multiply the minutes with 60 to get the minutes as ints + final BigDecimal minutes = minutesFraction.multiply(MINUTES); +- final BigDecimal minutesAsInt = minutes.setScale(0, BigDecimal.ROUND_HALF_UP); ++ final BigDecimal minutesAsInt = NumberUtil.performIntRounding(minutes); + return new TypeValuePair(NumberType.GENERIC_NUMBER, minutesAsInt); + } +-} +\ Pas de fin de ligne à la fin du fichier ++} diff --git a/external/jfreereport/patches/libformula-seconds_rounding.patch.1 b/external/jfreereport/patches/libformula-seconds_rounding.patch.1 new file mode 100644 index 000000000..369332d1a --- /dev/null +++ b/external/jfreereport/patches/libformula-seconds_rounding.patch.1 @@ -0,0 +1,37 @@ +diff -ur jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/SecondFunction.java jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/SecondFunction.java +--- jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/SecondFunction.java 2016-03-05 09:43:06.121774691 +0100 ++++ jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/SecondFunction.java 2016-03-05 09:51:04.810488511 +0100 +@@ -29,7 +29,7 @@ + import org.pentaho.reporting.libraries.formula.util.NumberUtil; + + /** +- * This function extracts the minute (0 through 59) from a time. ++ * This function extracts the seconds (0 through 59) from a time. + * + * @author Cedric Pronzato + */ +@@ -67,14 +67,15 @@ + + // time * 24 so that we get the full hours (which we remove later) + final BigDecimal bd = NumberUtil.getAsBigDecimal(n); +- final BigDecimal hours = bd.multiply(MINUTES_PER_DAY); +- final BigDecimal dayAndHoursAsInt = NumberUtil.performIntRounding(hours); +- final BigDecimal minutesFraction = hours.subtract(dayAndHoursAsInt); +- +- // Multiply the minutes with 60 to get the minutes as ints +- final BigDecimal seconds = minutesFraction.multiply(SECONDS); +- final BigDecimal secondsAsInt = NumberUtil.performIntRounding(seconds); ++ final BigDecimal minutes = bd.multiply(MINUTES_PER_DAY); ++ final BigDecimal dayHoursAndMinutesAsInt = NumberUtil.performIntRounding(minutes); ++ final BigDecimal secondsFraction = minutes.subtract(dayHoursAndMinutesAsInt); ++ ++ // Multiply the minutes with 60 to get the seconds as ints ++ final BigDecimal seconds = secondsFraction.multiply(SECONDS); ++ final BigDecimal nanoSeconds = seconds.setScale(9, BigDecimal.ROUND_HALF_UP); ++ final BigDecimal secondsAsInt = NumberUtil.performIntRounding(nanoSeconds); + + return new TypeValuePair(NumberType.GENERIC_NUMBER, secondsAsInt); + } +-} +\ No newline at end of file ++} diff --git a/external/jfreereport/patches/libformula-time-notz.patch b/external/jfreereport/patches/libformula-time-notz.patch new file mode 100644 index 000000000..fec65b17e --- /dev/null +++ b/external/jfreereport/patches/libformula-time-notz.patch @@ -0,0 +1,22 @@ +--- a/jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/DefaultLocalizationContext.java 2010-06-01 17:15:52.000000000 +0200 ++++ a/jfreereport_libformula.patched/source/org/pentaho/reporting/libraries/formula/DefaultLocalizationContext.java 2013-08-06 13:11:58.000000000 +0200 +@@ -162,11 +169,17 @@ + final Locale activeLocale = getLocale(); + datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, activeLocale)); + dateFormats.add(DateFormat.getDateInstance(DateFormat.FULL, activeLocale)); +- timeFormats.add(DateFormat.getTimeInstance(DateFormat.FULL, activeLocale)); ++ // LEM: "FULL" does not really make sense for isolated times: ++ // in the absence of a date, it cannot know whether it is meant in the winter-timezone ++ // or in the summer (daylight saving time) timezone, and will always display the winter timezone. ++ // timeFormats.add(DateFormat.getTimeInstance(DateFormat.FULL, activeLocale)); + + datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, activeLocale)); + dateFormats.add(DateFormat.getDateInstance(DateFormat.LONG, activeLocale)); +- timeFormats.add(DateFormat.getTimeInstance(DateFormat.LONG, activeLocale)); ++ // LEM: "LONG" does not really make sense for isolated times: ++ // in the absence of a date, it cannot know whether it is meant in the winter-timezone ++ // or in the summer (daylight saving time) timezone, and will always display the winter timezone. ++ // timeFormats.add(DateFormat.getTimeInstance(DateFormat.LONG, activeLocale)); + + datetimeFormats.add(DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, activeLocale)); + dateFormats.add(DateFormat.getDateInstance(DateFormat.MEDIUM, activeLocale)); diff --git a/external/jfreereport/patches/liblayout.patch b/external/jfreereport/patches/liblayout.patch new file mode 100644 index 000000000..cf82b5c05 --- /dev/null +++ b/external/jfreereport/patches/liblayout.patch @@ -0,0 +1,22 @@ +--- misc/liblayout-0.2.10/build.xml (Revision 6728) ++++ misc/build/liblayout-0.2.10/build.xml (Arbeitskopie) +@@ -24,9 +24,16 @@ + + <!-- Setup the compile classpath --> + <path id="classpath"> +- <fileset dir="lib"> +- <include name="*.jar" /> +- </fileset> ++ <pathelement path="${commons-logging.jar}"/> ++ <pathelement path="${flute.jar}"/> ++ <pathelement path="${libbase.jar}"/> ++ <pathelement path="${libformula.jar}"/> ++ <pathelement path="${libfonts.jar}"/> ++ <pathelement path="${libloader.jar}"/> ++ <pathelement path="${librepository.jar}"/> ++ <pathelement path="${libserializer.jar}"/> ++ <pathelement path="${libxml.jar}"/> ++ <pathelement path="${sac.jar}"/> + </path> + + <!-- Kill all the created directories --> diff --git a/external/jfreereport/patches/libloader-1.1.6-deprecated.patch b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch new file mode 100644 index 000000000..79fa046fd --- /dev/null +++ b/external/jfreereport/patches/libloader-1.1.6-deprecated.patch @@ -0,0 +1,34 @@ +--- misc/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2010-04-27 16:07:00.000000000 +0200 ++++ misc/build/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/ResourceException.java 2011-06-13 02:00:46.000000000 +0200 +@@ -42,7 +42,7 @@ + */ + public ResourceException(final String message, final Exception ex) + { +- super(message, ex); ++ super(message, (Throwable) ex); + } + + /** +--- misc/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java 2010-04-27 16:07:00.000000000 +0200 ++++ misc/build/libloader-1.1.6/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java 2014-07-24 15:11:26.000000000 +0200 +@@ -19,6 +19,7 @@ + + import java.io.File; + import java.io.IOException; ++import java.lang.SecurityException; + import java.net.MalformedURLException; + import java.net.URL; + import java.util.HashMap; +@@ -170,7 +171,11 @@ + final File file = (File) key.getIdentifier(); + try + { +- return file.toURL(); ++ return file.toURI().toURL(); ++ } ++ catch (SecurityException e) ++ { ++ return null; + } + catch (MalformedURLException e) + { diff --git a/external/jfreereport/patches/librepository-1.1.6-deprecated.patch b/external/jfreereport/patches/librepository-1.1.6-deprecated.patch new file mode 100644 index 000000000..324a8f416 --- /dev/null +++ b/external/jfreereport/patches/librepository-1.1.6-deprecated.patch @@ -0,0 +1,37 @@ +--- misc/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/ContentIOException.java 2010-04-27 16:04:50.000000000 +0200 ++++ misc/build/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/ContentIOException.java 2011-06-13 01:44:35.000000000 +0200 +@@ -43,7 +43,7 @@ + */ + public ContentIOException(final String message, final Exception ex) + { +- super(message, ex); ++ super(message, (Throwable) ex); + } + + /** +--- misc/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/file/FileRepository.java 2010-04-27 16:04:50.000000000 +0200 ++++ misc/build/librepository-1.1.6/source/org/pentaho/reporting/libraries/repository/file/FileRepository.java 2014-07-25 11:21:51.000000000 +0200 +@@ -19,7 +19,9 @@ + + import java.io.File; + import java.io.Serializable; ++import java.lang.SecurityException; + import java.net.MalformedURLException; ++import java.net.URI; + import java.net.URL; + + import org.pentaho.reporting.libraries.repository.ContentIOException; +@@ -104,6 +106,11 @@ + */ + public URL getURL() throws MalformedURLException + { +- return root.getBackend().toURL(); ++ try { ++ URI uri = root.getBackend().toURI(); ++ return uri.toURL(); ++ } catch (SecurityException e) { ++ throw new MalformedURLException("impossible" + e); ++ } + } + } + diff --git a/external/jfreereport/patches/sac.patch b/external/jfreereport/patches/sac.patch new file mode 100644 index 000000000..77db8511a --- /dev/null +++ b/external/jfreereport/patches/sac.patch @@ -0,0 +1,73 @@ +*** misc/sac-1.3/build.xml Thu Oct 18 09:22:24 2007 +--- misc/build/sac-1.3/build.xml Thu Oct 18 08:53:59 2007 +*************** +*** 1 **** +! dummy +--- 1,66 ---- +! <!-- simple generic build file --> +! +! <project name="sac" default="all" basedir="."> +! +! <!-- Properties --> +! +! <property name="name" value="sac"/> +! <property name="src" value="src"/> +! <property name="build" value="build"/> +! <property name="build.classes" value="${build}/classes"/> +! <property name="build.doc" value="${build}/api"/> +! <property name="build.lib" value="${build}/lib"/> +! <property name="packagenames" value="org.w3c.css.sac.*"/> +! +! <!-- Targets --> +! +! <!-- Prepare build directories --> +! <target name="prepare"> +! <mkdir dir="${src}"/> +! <mkdir dir="${build}"/> +! <mkdir dir="${build.classes}"/> +! <mkdir dir="${build.lib}"/> +! <mkdir dir="${build.doc}"/> +! <copy todir="${src}/org"> +! <fileset dir="org"/> +! </copy> +! </target> +! +! <!-- Kill all the created directories --> +! <target name="clean"> +! <delete dir="${build}"/> +! <delete dir="${src}"/> +! </target> +! +! <!-- Build classes --> +! <target name="classes" depends="prepare"> +! <javac srcdir="${src}" destdir="${build.classes}" debug="off" optimize="on"/> +! <copy todir="${build.classes}"> +! <fileset dir="${src}"> +! <include name="**/*.properties"/> +! </fileset> +! </copy> +! </target> +! +! <!-- Build jar archives --> +! <target name="jar" depends="classes"> +! <jar jarfile="${build.lib}/${name}.jar" basedir="${build.classes}"/> +! </target> +! +! <!-- Build the full JavaDocs --> +! <target name="javadoc" depends="prepare"> +! <javadoc sourcepath="${src}" +! destdir="${build.doc}" +! doctitle="${name} JavaDoc" +! windowtitle="${name} JavaDoc" +! package="true" +! author="true" +! version="true" +! packagenames="${packagenames}" +! /> +! </target> +! +! <!-- Build everything --> +! <target name="all" depends="jar,javadoc"/> +! +! </project> +\ No newline at end of file diff --git a/external/jfreereport/version.mk b/external/jfreereport/version.mk new file mode 100644 index 000000000..af5980f4a --- /dev/null +++ b/external/jfreereport/version.mk @@ -0,0 +1,10 @@ +FLUTE_VERSION=1.1.6 +LIBBASE_VERSION=1.1.6 +LIBFONTS_VERSION=1.1.6 +LIBFORMAT_VERSION=1.1.6 +LIBFORMULA_VERSION=1.1.7 +LIBLOADER_VERSION=1.1.6 +LIBREPOSITORY_VERSION=1.1.6 +LIBSERIALIZER_VERSION=1.1.6 +LIBXML_VERSION=1.1.7 + diff --git a/external/languagetool/ExtensionPackage_LanguageTool.mk b/external/languagetool/ExtensionPackage_LanguageTool.mk new file mode 100644 index 000000000..3b685d707 --- /dev/null +++ b/external/languagetool/ExtensionPackage_LanguageTool.mk @@ -0,0 +1,14 @@ +# -*- 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_ExtensionPackage_ExtensionPackage,LanguageTool,$(call gb_UnpackedTarball_get_dir,languagetool)/dist/LanguageTool.oxt)) + +$(eval $(call gb_ExtensionPackage_use_external_project,LanguageTool,languagetool)) + +# vim: set noet sw=4 ts=4: diff --git a/external/languagetool/ExternalProject_languagetool.mk b/external/languagetool/ExternalProject_languagetool.mk new file mode 100644 index 000000000..70b22a6aa --- /dev/null +++ b/external/languagetool/ExternalProject_languagetool.mk @@ -0,0 +1,40 @@ +# -*- 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,languagetool)) + +$(eval $(call gb_ExternalProject_register_targets,languagetool,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_jars,languagetool,\ + juh \ + jurt \ + ridl \ + unoil \ +)) + +$(call gb_ExternalProject_get_state_target,languagetool,build) : \ + $(call gb_Jar_get_target,libreoffice) + cd "$(call gb_UnpackedTarball_get_dir,languagetool)" && \ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -Dsource=$(JAVA_SOURCE_VER) \ + -Dtarget=$(JAVA_TARGET_VER) \ + $(if $(debug),-Dbuild.debug="on") \ + -Dext.ooo.juh.lib="$(call gb_Jar_get_target,juh)" \ + -Dext.ooo.jurt.lib="$(call gb_Jar_get_target,jurt)" \ + -Dext.ooo.ridl.lib="$(call gb_Jar_get_target,ridl)" \ + -Dext.ooo.unoil.lib="$(call gb_Jar_get_target,unoil)" \ + dist && \ + touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/external/languagetool/JLanguageTool-1.4.0-no-hc.patch b/external/languagetool/JLanguageTool-1.4.0-no-hc.patch new file mode 100644 index 000000000..4337ec6eb --- /dev/null +++ b/external/languagetool/JLanguageTool-1.4.0-no-hc.patch @@ -0,0 +1,22 @@ +--- misc/build/JLanguageTool-1.7.0/build.xml 2012-02-29 22:18:05.118789546 +0100 ++++ misc/build/JLanguageTool-1.7.0/build.xml 2012-02-29 22:17:02.385235706 +0100 +@@ -82,7 +82,6 @@ + <include name="openoffice/Linguistic.xcu"/> + <include name="openoffice/description.xml"/> + <include name="openoffice/images/dialog.png"/> +- <include name="openoffice/images/dialogh.png"/> + <include name="openoffice/images/LanguageToolBig.png"/> + <include name="openoffice/images/LanguageToolSmall.png"/> + <include name="openoffice/images/dialog.png"/> +--- misc/build/JLanguageTool-1.7.0/openoffice/Linguistic.xcu 2011-06-26 20:29:43.000000000 +0200 ++++ misc/build/JLanguageTool-1.7.0/openoffice/Linguistic.xcu 2012-02-29 22:17:25.551071099 +0100 +@@ -27,9 +27,6 @@ + <prop oor:name="SpellAndGrammarDialogImage" oor:type="xs:string"> + <value>%origin%/images/dialog.png</value> + </prop> +- <prop oor:name="SpellAndGrammarDialogImage_HC" oor:type="xs:string"> +- <value>%origin%/images/dialogh.png</value> +- </prop> + </node> + </node> + </node> diff --git a/external/languagetool/JLanguageTool-1.7.0.patch b/external/languagetool/JLanguageTool-1.7.0.patch new file mode 100644 index 000000000..782b683af --- /dev/null +++ b/external/languagetool/JLanguageTool-1.7.0.patch @@ -0,0 +1,141 @@ +diff -Naur misc/build/JLanguageTool-1.7.0/build.xml misc/build/JLanguageTool-1.7.0_patched/build.xml +--- misc/build/JLanguageTool-1.7.0/build.xml 2012-06-25 08:22:35.000000000 +0200 ++++ misc/build/JLanguageTool-1.7.0_patched/build.xml 2012-06-25 09:27:39.077442000 +0200 +@@ -29,7 +29,9 @@ + <pathelement location="${ext.CJFtransform.lib}" /> + <pathelement location="${ext.commons-validator.lib}" /> + <!-- --> +- <pathelement location="${ext.ooo.juh.lib}" /> ++ <pathelement location="${ext.junit.lib}"/> ++ <!-- --> ++ <pathelement location="${ext.ooo.juh.lib}" /> + <pathelement location="${ext.ooo.unoil.lib}" /> + <pathelement location="${ext.ooo.ridl.lib}" /> + <pathelement location="${ext.ooo.jurt.lib}" /> +@@ -442,11 +444,11 @@ + <!-- ================================================================== --> + + <target name="dist" depends="ooo-internal" description="Builds one ZIP for both OpenOffice.org and stand-alone use"> +-<zip compress="yes" destfile="${dist.dir}/LanguageTool-${version}.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" /> ++<zip compress="yes" destfile="${dist.dir}/LanguageTool.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" /> + </target> + + <target name="fast" depends="ooo-internal" description="like dist, but without ZIP compression (for development only)"> +-<zip compress="no" destfile="${dist.dir}/LanguageTool-${version}.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" /> ++<zip compress="no" destfile="${dist.dir}/LanguageTool.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" /> + </target> + + <target name="common" depends="clean,init,build,ooo-build"> +@@ -651,7 +653,6 @@ + <copy file="${resource.dir}/ast/asturian.dict" todir="${dist.dir}/resource/ast" /> + <copy file="${resource.dir}/ast/asturian.info" todir="${dist.dir}/resource/ast" /> + +- <copy file="${resource.dir}/xx/dummy.dict" tofile="${dist.dir}/resource/cs/czech.dict" /> + <copy todir="${dist.dir}/rules"> + <fileset dir="src/rules" excludes="CVS" /> + </copy> +@@ -678,7 +678,7 @@ + + <filter filtersFile="ooolocales.properties" /> + <copy filtering="true" encoding="${encoding}" todir="${dist.dir}/"> +- <fileset dir="openoffice/" includes="description.xml,*.xcu,Options.xdl,META-INF/**" /> ++ <fileset dir="openoffice/" includes="components.rdb,description.xml,*.xcu,Options.xdl,META-INF/**" /> + </copy> + <copy todir="${dist.dir}/"> + <fileset dir="openoffice/" includes="images/**,help/**" /> +diff -Naur misc/build/JLanguageTool-1.7.0/openoffice/components.rdb misc/build/JLanguageTool-1.7.0_patched/openoffice/components.rdb +--- misc/build/JLanguageTool-1.7.0/openoffice/components.rdb 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/JLanguageTool-1.7.0_patched/openoffice/components.rdb 2012-06-25 10:26:23.183633100 +0200 +@@ -0,0 +1,9 @@ ++<?xml version="1.0"?> ++<components xmlns="http://openoffice.org/2010/uno-components"> ++ <component loader="com.sun.star.loader.Java2" uri="./LanguageTool.uno.jar"> ++ <implementation name="org.languagetool.openoffice.Main"> ++ <service name="com.sun.star.linguistic2.Proofreader"/> ++ <service name="org.languagetool.openoffice.Main"/> ++ </implementation> ++ </component> ++</components> +diff -Naur misc/build/JLanguageTool-1.7.0/openoffice/META-INF/manifest.xml misc/build/JLanguageTool-1.7.0_patched/openoffice/META-INF/manifest.xml +--- misc/build/JLanguageTool-1.7.0/openoffice/META-INF/manifest.xml 2012-06-25 08:22:34.000000000 +0200 ++++ misc/build/JLanguageTool-1.7.0_patched/openoffice/META-INF/manifest.xml 2012-06-25 09:39:56.751738000 +0200 +@@ -2,8 +2,8 @@ + <manifest:manifest> + <manifest:file-entry manifest:full-path="Addons.xcu" + manifest:media-type="application/vnd.sun.star.configuration-data" /> +- <manifest:file-entry manifest:full-path="LanguageTool.uno.jar" +- manifest:media-type="application/vnd.sun.star.uno-component;type=Java" /> ++ <manifest:file-entry manifest:full-path="components.rdb" ++ manifest:media-type="application/vnd.sun.star.uno-components" /> + <manifest:file-entry + manifest:media-type="application/vnd.sun.star.configuration-data" + manifest:full-path="Linguistic.xcu" /> +diff -Naur misc/build/JLanguageTool-1.7.0/openoffice/description.xml misc/build/JLanguageTool-1.7.0_patched/openoffice/description.xml +--- misc/build/JLanguageTool-1.7.0/openoffice/description.xml 2012-06-25 08:22:35.000000000 +0200 ++++ misc/build/JLanguageTool-1.7.0_patched/openoffice/description.xml 2012-06-25 10:29:48.520591800 +0200 +@@ -21,7 +21,7 @@ + <name lang="zh">LanguageTool. 开源的语言检查工具</name> + <name lang="br">LanguageTool. Reizher reizhskrivadurel frank.</name> + </display-name> +- <version value="@version@" /> ++ <version value="1.7.1" /> + <release-notes> + <src xlink:href="CHANGES.txt" lang="en" /> + </release-notes> +diff -Naur misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/gui/Configuration.java misc/build/JLanguageTool-1.7.0_patched/src/java/org/languagetool/gui/Configuration.java +--- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/gui/Configuration.java 2012-06-25 08:21:31.000000000 +0200 ++++ misc/build/JLanguageTool-1.7.0_patched/src/java/org/languagetool/gui/Configuration.java 2012-06-25 09:31:40.737466400 +0200 +@@ -23,6 +23,7 @@ + import java.io.FileNotFoundException; + import java.io.FileOutputStream; + import java.io.IOException; ++import java.lang.ClassLoader; + import java.util.*; + + import org.languagetool.Language; +@@ -142,7 +143,18 @@ + + final String motherTongueStr = (String) props.get(MOTHER_TONGUE_CONFIG_KEY); + if (motherTongueStr != null) { +- motherTongue = Language.getLanguageForShortName(motherTongueStr); ++ // FIXME: hack to disable the functionality for JRE 1.5 ++ // javax.xml.bind.JAXBException is part of JRE 1.6 ++ boolean isJRE15 = false; ++ try { ++ ClassLoader cl = ClassLoader.getSystemClassLoader(); ++ cl.loadClass("javax.xml.bind.JAXBException"); ++ } catch (ClassNotFoundException e) { ++ isJRE15 = true; ++ } ++ if (!isJRE15) { ++ motherTongue = Language.getLanguageForShortName(motherTongueStr); ++ } + } + + final String autoDetectStr = (String) props.get(AUTO_DETECT_CONFIG_KEY); +diff -Naur misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/openoffice/Main.java misc/build/JLanguageTool-1.7.0_patched/src/java/org/languagetool/openoffice/Main.java +--- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/openoffice/Main.java 2012-06-25 08:21:28.000000000 +0200 ++++ misc/build/JLanguageTool-1.7.0_patched/src/java/org/languagetool/openoffice/Main.java 2012-06-25 09:36:03.778528700 +0200 +@@ -24,6 +24,7 @@ + * @author Marcin Miłkowski + */ + import java.io.File; ++import java.lang.ClassLoader; + import java.util.ArrayList; + import java.util.Arrays; + import java.util.Comparator; +@@ -494,6 +495,14 @@ + */ + @Override + public final Locale[] getLocales() { ++ // FIXME: hack to disable the functionality for JRE 1.5 ++ // javax.xml.bind.JAXBException is part of JRE 1.6 ++ try { ++ ClassLoader cl = ClassLoader.getSystemClassLoader(); ++ cl.loadClass("javax.xml.bind.JAXBException"); ++ } catch (ClassNotFoundException e) { ++ return new Locale[0]; ++ } + try { + int dims = 0; + for (final Language element : Language.LANGUAGES) { diff --git a/external/languagetool/Makefile b/external/languagetool/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/languagetool/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/languagetool/MessageBox-apichange.patch b/external/languagetool/MessageBox-apichange.patch new file mode 100644 index 000000000..ceea259b8 --- /dev/null +++ b/external/languagetool/MessageBox-apichange.patch @@ -0,0 +1,30 @@ +--- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/openoffice/OOoAboutDialog.java 2013-07-11 13:33:26.681387525 +0100 ++++ misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/openoffice/OOoAboutDialog.java 2013-07-11 13:34:46.666424549 +0100 +@@ -19,6 +19,7 @@ + package org.languagetool.openoffice; + + import com.sun.star.awt.Rectangle; ++import com.sun.star.awt.MessageBoxType; + import com.sun.star.awt.XMessageBox; + import com.sun.star.awt.XMessageBoxFactory; + import com.sun.star.awt.XWindowPeer; +@@ -49,16 +50,14 @@ + .getString("guiMenuAbout")); + final XMessageBoxFactory messageBoxFactory = (XMessageBoxFactory) UnoRuntime + .queryInterface(XMessageBoxFactory.class, winPeer.getToolkit()); +- final Rectangle messageBoxRectangle = new Rectangle(); + final XMessageBox box = messageBoxFactory + .createMessageBox( + winPeer, +- messageBoxRectangle, +- "infobox", ++ MessageBoxType.INFOBOX, + 0, + aboutDialogTitle, + getAboutText()); + box.execute(); + } + +-} +\ No newline at end of file ++} diff --git a/external/languagetool/Module_languagetool.mk b/external/languagetool/Module_languagetool.mk new file mode 100644 index 000000000..0574d55d6 --- /dev/null +++ b/external/languagetool/Module_languagetool.mk @@ -0,0 +1,22 @@ +# -*- 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,languagetool)) + +ifneq ($(ENABLE_JAVA),) +ifneq ($(filter LANGUAGETOOL,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,languagetool,\ + ExternalProject_languagetool \ + ExtensionPackage_LanguageTool \ + UnpackedTarball_languagetool \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/languagetool/README b/external/languagetool/README new file mode 100644 index 000000000..1a33382f7 --- /dev/null +++ b/external/languagetool/README @@ -0,0 +1,5 @@ +Style and grammar checker for various languages written in Java, from [http://www.languagetool.org/] + +Shipping this is a compile-time option for LibreOffice, but our +downloadable builds use the light-weight lightproof grammar checker +instead to avoid the Java bootstrapping performance issues. diff --git a/external/languagetool/UnpackedTarball_languagetool.mk b/external/languagetool/UnpackedTarball_languagetool.mk new file mode 100644 index 000000000..757a4b35e --- /dev/null +++ b/external/languagetool/UnpackedTarball_languagetool.mk @@ -0,0 +1,25 @@ +# -*- 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,languagetool)) + +$(eval $(call gb_UnpackedTarball_set_tarball,languagetool,$(LANGUAGETOOL_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,languagetool,3)) + +$(eval $(call gb_UnpackedTarball_add_patches,languagetool,\ + external/languagetool/JLanguageTool-1.7.0.patch \ + external/languagetool/JLanguageTool-1.4.0-no-hc.patch \ + external/languagetool/MessageBox-apichange.patch \ + external/languagetool/english.ireland.patch \ + external/languagetool/esperanto.territory.patch \ + external/languagetool/french.haiti.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/languagetool/english.ireland.patch b/external/languagetool/english.ireland.patch new file mode 100644 index 000000000..2e47d3247 --- /dev/null +++ b/external/languagetool/english.ireland.patch @@ -0,0 +1,11 @@ +--- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/English.java.orig 2013-11-18 09:41:10.625421948 +0000 ++++ misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/English.java 2013-11-18 09:41:25.736570684 +0000 +@@ -67,7 +67,7 @@ + + @Override + public final String[] getCountryVariants() { +- return new String[]{"GB", "US", "AU", "CA", "NZ", "ZA"}; ++ return new String[]{"GB", "US", "AU", "CA", "IE", "NZ", "ZA"}; + } + + @Override diff --git a/external/languagetool/esperanto.territory.patch b/external/languagetool/esperanto.territory.patch new file mode 100644 index 000000000..6037adc43 --- /dev/null +++ b/external/languagetool/esperanto.territory.patch @@ -0,0 +1,12 @@ +--- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/Esperanto.java.orig 2013-11-18 10:18:49.111712785 +0000 ++++ misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/Esperanto.java 2013-11-18 10:18:59.254813036 +0000 +@@ -71,8 +71,7 @@ + + @Override + public String[] getCountryVariants() { +- /* return "ANY" country code as a "country-less" placeholder for OOo: */ +- return new String[] {"ANY"}; ++ return new String[] {""}; + } + + @Override diff --git a/external/languagetool/french.haiti.patch b/external/languagetool/french.haiti.patch new file mode 100644 index 000000000..207699e70 --- /dev/null +++ b/external/languagetool/french.haiti.patch @@ -0,0 +1,11 @@ +--- misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/French.java ++++ misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/French.java +@@ -54,7 +54,7 @@ + @Override + public String[] getCountryVariants() { + return new String[]{"FR", "", "BE", "CH", "CA", "LU", "MC", "CM", +- "CI", "HI", "ML", "SN", "CD", "MA", "RE"}; ++ "CI", "HT", "ML", "SN", "CD", "MA", "RE"}; + } + + @Override diff --git a/external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1 b/external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1 new file mode 100644 index 000000000..00d404fad --- /dev/null +++ b/external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1 @@ -0,0 +1,141 @@ +From 768f70ca405cd3159d990e962d54456773bb8cf8 Mon Sep 17 00:00:00 2001 +From: Marti Maria <info@littlecms.com> +Date: Wed, 15 Aug 2018 20:07:56 +0200 +Subject: [PATCH 17/18] Upgrade Visual studio 2017 15.8 + +- Upgrade to 15.8 +- Add check on CGATS memory allocation (thanks to Quang Nguyen for +pointing out this) +--- + Projects/VC2017/jpegicc/jpegicc.vcxproj | 1 + + Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj | 2 +- + Projects/VC2017/lcms2_static/lcms2_static.vcxproj | 2 +- + Projects/VC2017/linkicc/linkicc.vcxproj | 2 +- + Projects/VC2017/psicc/psicc.vcxproj | 2 +- + Projects/VC2017/testbed/testbed.vcxproj | 2 +- + Projects/VC2017/tiffdiff/tiffdiff.vcxproj | 2 +- + Projects/VC2017/tifficc/tifficc.vcxproj | 2 +- + Projects/VC2017/transicc/transicc.vcxproj | 1 + + src/cmscgats.c | 14 ++++++++++---- + 10 files changed, 19 insertions(+), 11 deletions(-) + +diff --git a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj +index 4c8aa3f..d1bf3eb 100644 +--- a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj ++++ b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj +@@ -22,7 +22,6 @@ + <ProjectGuid>{8C51BE48-ADB8-4089-A9EC-F6BF993A0548}</ProjectGuid> + <RootNamespace>lcms2_DLL</RootNamespace> + <Keyword>Win32Proj</Keyword> +- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> +diff --git a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj +index 2a9988a..9fc05ce 100644 +--- a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj ++++ b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj +@@ -22,7 +22,6 @@ + <ProjectGuid>{71DEDE59-3F1E-486B-A899-4283000F76B5}</ProjectGuid> + <RootNamespace>lcms2_static</RootNamespace> + <Keyword>Win32Proj</Keyword> +- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> +diff --git a/Projects/VC2017/linkicc/linkicc.vcxproj b/Projects/VC2017/linkicc/linkicc.vcxproj +index 30c2b4e..51586dd 100644 +--- a/Projects/VC2017/linkicc/linkicc.vcxproj ++++ b/Projects/VC2017/linkicc/linkicc.vcxproj +@@ -22,7 +22,6 @@ + <ProjectGuid>{FBFBE1DC-DB84-4BA1-9552-B4780F457849}</ProjectGuid> + <RootNamespace>linkicc</RootNamespace> + <Keyword>Win32Proj</Keyword> +- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> +diff --git a/Projects/VC2017/psicc/psicc.vcxproj b/Projects/VC2017/psicc/psicc.vcxproj +index 9dcf89a..8f26e12 100644 +--- a/Projects/VC2017/psicc/psicc.vcxproj ++++ b/Projects/VC2017/psicc/psicc.vcxproj +@@ -22,7 +22,6 @@ + <ProjectGuid>{EF6A8851-65FE-46F5-B9EF-14F0B671F693}</ProjectGuid> + <RootNamespace>psicc</RootNamespace> + <Keyword>Win32Proj</Keyword> +- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> +diff --git a/Projects/VC2017/testbed/testbed.vcxproj b/Projects/VC2017/testbed/testbed.vcxproj +index 0af3762..3f6aea3 100644 +--- a/Projects/VC2017/testbed/testbed.vcxproj ++++ b/Projects/VC2017/testbed/testbed.vcxproj +@@ -22,7 +22,6 @@ + <ProjectGuid>{928A3A2B-46EF-4279-959C-513B3652FF0E}</ProjectGuid> + <RootNamespace>testbed</RootNamespace> + <Keyword>Win32Proj</Keyword> +- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> +diff --git a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj +index 7edfe28..3a6d837 100644 +--- a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj ++++ b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj +@@ -22,7 +22,6 @@ + <ProjectGuid>{75B91835-CCD7-48BE-A606-A9C997D5DBEE}</ProjectGuid> + <RootNamespace>tiffdiff</RootNamespace> + <Keyword>Win32Proj</Keyword> +- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> +diff --git a/Projects/VC2017/tifficc/tifficc.vcxproj b/Projects/VC2017/tifficc/tifficc.vcxproj +index cd9f04c..5ef954f 100644 +--- a/Projects/VC2017/tifficc/tifficc.vcxproj ++++ b/Projects/VC2017/tifficc/tifficc.vcxproj +@@ -22,7 +22,6 @@ + <ProjectGuid>{2256DE16-ED92-4A6F-9C54-F65BB61E64A2}</ProjectGuid> + <RootNamespace>tifficc</RootNamespace> + <Keyword>Win32Proj</Keyword> +- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> +diff --git a/src/cmscgats.c b/src/cmscgats.c +index 1a87613..8c3e96d 100644 +--- a/src/cmscgats.c ++++ b/src/cmscgats.c +@@ -1,7 +1,7 @@ + //--------------------------------------------------------------------------------- + // + // Little Color Management System +-// Copyright (c) 1998-2017 Marti Maria Saguer ++// Copyright (c) 1998-2018 Marti Maria Saguer + // + // Permission is hereby granted, free of charge, to any person obtaining + // a copy of this software and associated documentation files (the "Software"), +@@ -1506,10 +1506,16 @@ void AllocateDataSet(cmsIT8* it8) + t-> nSamples = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS")); + t-> nPatches = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_SETS")); + +- t-> Data = (char**)AllocChunk (it8, ((cmsUInt32Number) t->nSamples + 1) * ((cmsUInt32Number) t->nPatches + 1) *sizeof (char*)); +- if (t->Data == NULL) { ++ if (t -> nSamples < 0 || t->nSamples > 0x7ffe || t->nPatches < 0 || t->nPatches > 0x7ffe) ++ { ++ SynError(it8, "AllocateDataSet: too much data"); ++ } ++ else { ++ t->Data = (char**)AllocChunk(it8, ((cmsUInt32Number)t->nSamples + 1) * ((cmsUInt32Number)t->nPatches + 1) * sizeof(char*)); ++ if (t->Data == NULL) { + +- SynError(it8, "AllocateDataSet: Unable to allocate data array"); ++ SynError(it8, "AllocateDataSet: Unable to allocate data array"); ++ } + } + + } +-- +2.17.1 + diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk new file mode 100644 index 000000000..4efd696c4 --- /dev/null +++ b/external/lcms2/ExternalPackage_lcms2.mk @@ -0,0 +1,28 @@ +# -*- 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_ExternalPackage_ExternalPackage,lcms2,lcms2)) + +$(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2)) + +ifeq ($(DISABLE_DYNLOADING),) +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib)) +else ifeq ($(OS),WNT) +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2-2.dll,src/.libs/liblcms2-2.dll)) +else ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2.dll)) +endif # $(COM) +else # $(OS) != WNT/MACOSX +$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.8)) +endif # $(OS) +endif # $(DISABLE_DYNLOADING) + +# vim: set noet sw=4 ts=4: diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk new file mode 100644 index 000000000..521024209 --- /dev/null +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -0,0 +1,48 @@ +# -*- 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,lcms2)) + +$(eval $(call gb_ExternalProject_register_targets,lcms2,\ + build \ +)) + +ifeq ($(COM),MSC) + +$(call gb_ExternalProject_get_state_target,lcms2,build): + $(call gb_Trace_StartRange,lcms2,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + MSBuild.exe lcms2_DLL.vcxproj \ + $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \ + $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ + /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:TargetName=lcms2 \ + ,Projects/VC2017/lcms2_DLL) + $(call gb_Trace_EndRange,lcms2,EXTERNAL) +else +$(call gb_ExternalProject_get_state_target,lcms2,build): + $(call gb_Trace_StartRange,lcms2,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure --without-jpeg --without-tiff --with-pic \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ + CPPFLAGS=" $(SOLARINC)" \ + CFLAGS='$(CFLAGS) $(if $(debug),$(gb_DEBUGINFO_FLAGS)) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))' \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && cd src \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,lcms2,EXTERNAL) +endif +# vim: set noet sw=4 ts=4: diff --git a/external/lcms2/Makefile b/external/lcms2/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/lcms2/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/lcms2/Module_lcms2.mk b/external/lcms2/Module_lcms2.mk new file mode 100644 index 000000000..807dbae43 --- /dev/null +++ b/external/lcms2/Module_lcms2.mk @@ -0,0 +1,18 @@ +# -*- 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,lcms2)) + +$(eval $(call gb_Module_add_targets,lcms2,\ + UnpackedTarball_lcms2 \ + ExternalPackage_lcms2 \ + ExternalProject_lcms2 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/lcms2/README b/external/lcms2/README new file mode 100644 index 000000000..10b18a5ad --- /dev/null +++ b/external/lcms2/README @@ -0,0 +1,3 @@ +lcms2 (little cms engine) +lcms2: Little cms is a small, speed optimized color management engine. +with the new libcdr, writerperfect will depend on lcms2
\ No newline at end of file diff --git a/external/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk new file mode 100644 index 000000000..c5e1839cf --- /dev/null +++ b/external/lcms2/UnpackedTarball_lcms2.mk @@ -0,0 +1,25 @@ +# -*- 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,lcms2)) + +$(eval $(call gb_UnpackedTarball_set_tarball,lcms2,$(LCMS2_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,lcms2)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3)) + +$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\ + external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1 \ + external/lcms2/lcms2-2.4-windows.patch \ + external/lcms2/lcms2-msvc-disable-sse2.patch.1 \ + external/lcms2/c++17.patch.0 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/lcms2/c++17.patch.0 b/external/lcms2/c++17.patch.0 new file mode 100644 index 000000000..9a9de3f04 --- /dev/null +++ b/external/lcms2/c++17.patch.0 @@ -0,0 +1,22 @@ +--- include/lcms2.h ++++ include/lcms2.h +@@ -1248,13 +1248,13 @@ + CMSAPI void* CMSEXPORT cmsStageData(const cmsStage* mpe); + + // Sampling +-typedef cmsInt32Number (* cmsSAMPLER16) (register const cmsUInt16Number In[], +- register cmsUInt16Number Out[], +- register void * Cargo); ++typedef cmsInt32Number (* cmsSAMPLER16) (const cmsUInt16Number In[], ++ cmsUInt16Number Out[], ++ void * Cargo); + +-typedef cmsInt32Number (* cmsSAMPLERFLOAT)(register const cmsFloat32Number In[], +- register cmsFloat32Number Out[], +- register void * Cargo); ++typedef cmsInt32Number (* cmsSAMPLERFLOAT)(const cmsFloat32Number In[], ++ cmsFloat32Number Out[], ++ void * Cargo); + + // Use this flag to prevent changes being written to destination + #define SAMPLER_INSPECT 0x01000000 diff --git a/external/lcms2/lcms2-2.4-windows.patch b/external/lcms2/lcms2-2.4-windows.patch new file mode 100644 index 000000000..749a81200 --- /dev/null +++ b/external/lcms2/lcms2-2.4-windows.patch @@ -0,0 +1,20 @@ +TODO: Is this still needed? + +--- misc/lcms2-2.4/include/lcms2.h 2011-12-15 16:45:47.000000000 +0100 ++++ misc/build/lcms2-2.4/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 +@@ -192,6 +192,15 @@ typedef int cmsBool; + #endif // CMS_USE_BIG_ENDIAN + + ++// LibreOffice always builds this as DLL and with the stdcall calling ++// convention, so make this usable from outside without having to ++// specify CMS_DLL manually whenever the library is used. ++#ifndef CMS_DLL_BUILD ++#ifndef CMS_DLL ++#define CMS_DLL ++#endif ++#endif ++ + // Calling convention -- this is hardly platform and compiler dependent + #ifdef CMS_IS_WINDOWS_ + # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) diff --git a/external/lcms2/lcms2-msvc-disable-sse2.patch.1 b/external/lcms2/lcms2-msvc-disable-sse2.patch.1 new file mode 100644 index 000000000..37ef7730b --- /dev/null +++ b/external/lcms2/lcms2-msvc-disable-sse2.patch.1 @@ -0,0 +1,10 @@ +--- lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj.orig 2014-10-02 15:15:40.228020086 +0200 ++++ lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj 2014-10-02 15:15:42.243019930 +0200 +@@ -133,6 +133,7 @@ + </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <Optimization>Full</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk new file mode 100644 index 000000000..50e66fdb7 --- /dev/null +++ b/external/libabw/ExternalProject_libabw.mk @@ -0,0 +1,46 @@ +# -*- 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,libabw)) + +$(eval $(call gb_ExternalProject_use_autoconf,libabw,build)) + +$(eval $(call gb_ExternalProject_register_targets,libabw,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libabw,\ + boost_headers \ + libxml2 \ + revenge \ + zlib \ +)) + +$(call gb_ExternalProject_get_state_target,libabw,build) : + $(call gb_Trace_StartRange,libabw,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-tools \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-werror \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(gb_FULLDEPS),,--disable-dependency-tracking) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libabw,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libabw/Makefile b/external/libabw/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libabw/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/libabw/Module_libabw.mk b/external/libabw/Module_libabw.mk new file mode 100644 index 000000000..096150613 --- /dev/null +++ b/external/libabw/Module_libabw.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,libabw)) + +$(eval $(call gb_Module_add_targets,libabw,\ + ExternalProject_libabw \ + UnpackedTarball_libabw \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libabw/README b/external/libabw/README new file mode 100644 index 000000000..ce209901f --- /dev/null +++ b/external/libabw/README @@ -0,0 +1,3 @@ +AbiWord file word processor format import library from + +[https://wiki.documentfoundation.org/DLP/Libraries/libabw] diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk new file mode 100644 index 000000000..6860e0905 --- /dev/null +++ b/external/libabw/UnpackedTarball_libabw.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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk new file mode 100644 index 000000000..955dddd3c --- /dev/null +++ b/external/libassuan/ExternalPackage_libassuan.mk @@ -0,0 +1,28 @@ +# -*- 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_ExternalPackage_ExternalPackage,libassuan,libassuan)) + +$(eval $(call gb_ExternalPackage_use_external_project,libassuan,libassuan)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) + +ifeq ($(OS),LINUX) + +$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.1)) + +else ifeq ($(OS),MACOSX) + +$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.0.dylib,src/.libs/libassuan.0.dylib)) + +endif + +endif # $(DISABLE_DYNLOADING) + +# vim: set noet sw=4 ts=4: diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk new file mode 100644 index 000000000..565d38ff9 --- /dev/null +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -0,0 +1,67 @@ +# -*- 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,libassuan)) + +$(eval $(call gb_ExternalProject_register_targets,libassuan,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_autoconf,libassuan,build)) + +$(eval $(call gb_ExternalProject_use_externals,libassuan,\ + libgpg-error \ +)) + +ifeq ($(COM),MSC) +gb_ExternalProject_libassuan_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) +gb_ExternalProject_libassuan_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64) +$(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executable_get_target,cpp) + $(call gb_Trace_StartRange,libassuan,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + autoreconf \ + && ./configure \ + --enable-static \ + --disable-shared \ + --disable-doc \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(CXXFLAGS)" \ + GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ + GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ + --host=$(gb_ExternalProject_libassuan_host) \ + RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + MAKE=$(MAKE) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libassuan,EXTERNAL) +else +$(call gb_ExternalProject_get_state_target,libassuan,build): + $(call gb_Trace_StartRange,libassuan,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + autoreconf \ + && ./configure \ + --disable-doc \ + GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ + GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ + $(if $(filter LINUX,$(OS)), \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/.libs/libassuan.0.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,libassuan,EXTERNAL) + +endif +# vim: set noet sw=4 ts=4: diff --git a/external/libassuan/Makefile b/external/libassuan/Makefile new file mode 100644 index 000000000..569ad8a0b --- /dev/null +++ b/external/libassuan/Makefile @@ -0,0 +1,14 @@ +# -*- 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/. +# + +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/libassuan/Module_libassuan.mk b/external/libassuan/Module_libassuan.mk new file mode 100644 index 000000000..45ada66ee --- /dev/null +++ b/external/libassuan/Module_libassuan.mk @@ -0,0 +1,18 @@ +# -*- 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,libassuan)) + +$(eval $(call gb_Module_add_targets,libassuan,\ + ExternalProject_libassuan \ + ExternalPackage_libassuan \ + UnpackedTarball_libassuan \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libassuan/README b/external/libassuan/README new file mode 100644 index 000000000..cd35103a1 --- /dev/null +++ b/external/libassuan/README @@ -0,0 +1,3 @@ +A small library implementing Assuan protocol which is used as IPC +between most of the newer GnuPG components +[https://www.gnupg.org/related_software/libassuan/index.html] diff --git a/external/libassuan/UnpackedTarball_libassuan.mk b/external/libassuan/UnpackedTarball_libassuan.mk new file mode 100644 index 000000000..295b87d49 --- /dev/null +++ b/external/libassuan/UnpackedTarball_libassuan.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,libassuan)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libassuan,$(LIBASSUAN_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libassuan,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,libassuan, \ + external/libassuan/find-libgpg-error.patch \ + external/libassuan/fix-autoconf-macros.patch \ + $(if $(filter MSC,$(COM)),external/libassuan/w32-build-fixes.patch.1) \ + external/libassuan/w32-build-fixes-2.patch \ + $(if $(filter LINUX,$(OS)),external/libassuan/rpath.patch) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libassuan/find-libgpg-error.patch b/external/libassuan/find-libgpg-error.patch new file mode 100644 index 000000000..57361ab5e --- /dev/null +++ b/external/libassuan/find-libgpg-error.patch @@ -0,0 +1,18 @@ +--- configure.ac 2017-02-13 14:34:06.983449082 +0100 ++++ configure.ac 2017-02-13 15:36:50.944653536 +0100 +@@ -355,7 +355,14 @@ + + + # Checking for libgpg-error. +-AM_PATH_GPG_ERROR(1.17,, AC_MSG_ERROR([libgpg-error was not found])) ++if test "${GPG_ERROR_CFLAGS+set}" != "set"; then ++ AM_PATH_GPG_ERROR(1.17,, AC_MSG_ERROR([libgpg-error was not found])) ++else ++ GPG_ERROR_CFLAGS="$GPG_ERROR_CFLAGS" ++ GPG_ERROR_LIBS="$GPG_ERROR_LIBS" ++ AC_SUBST(GPG_ERROR_CFLAGS) ++ AC_SUBST(GPG_ERROR_LIBS) ++fi + + # + # Checks for library functions. diff --git a/external/libassuan/fix-autoconf-macros.patch b/external/libassuan/fix-autoconf-macros.patch new file mode 100644 index 000000000..4a2d035b5 --- /dev/null +++ b/external/libassuan/fix-autoconf-macros.patch @@ -0,0 +1,56 @@ +diff -ur libassuan.org/configure.ac libassuan/configure.ac +--- configure.ac 2017-02-16 18:32:51.549527554 +0100 ++++ configure.ac~ 2017-02-16 18:32:59.893497890 +0100 +@@ -44,6 +44,14 @@ + # the decimalized short revision number, a beta version string and a + # flag indicating a development version (mym4_isbeta). Note that the + # m4 processing is done by autoconf and not during the configure run. ++m4_define([m4_chomp_all], ++[m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [ ++/], [/ ]), [/*$]), [$1])]) ++ ++m4_define([m4_argn], ++[m4_assert([0 < $1])]dnl ++[m4_pushdef([_$0], [_m4_popdef([_$0])]m4_dquote([$]m4_incr([$1])))_$0($@)]) ++m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))]) + m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \ + mym4_package mym4_major mym4_minor mym4_micro),[:])) + m4_define([mym4_isbeta], m4_argn(2, mym4_verslist)) +@@ -75,7 +80,22 @@ + VERSION=$PACKAGE_VERSION + + AC_CONFIG_AUX_DIR([build-aux]) +-AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) ++ ++dnl Initialize automake. automake < 1.12 didn't have serial-tests and ++dnl gives an error if it sees this, but for automake >= 1.13 ++dnl serial-tests is required so we have to include it. Solution is to ++dnl test for the version of automake (by running an external command) ++dnl and provide it if necessary. Note we have to do this entirely using ++dnl m4 macros since automake queries this macro by running ++dnl 'autoconf --trace ...'. ++m4_define([serial_tests], [ ++ m4_esyscmd([automake --version | ++ head -1 | ++ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}' ++ ]) ++]) ++AM_INIT_AUTOMAKE(foreign serial_tests dist-bzip2 no-dist-gzip) dnl NB: Do not [quote] this parameter. ++ + AM_MAINTAINER_MODE + AC_CONFIG_SRCDIR(src/assuan.h.in) + AC_CONFIG_MACRO_DIR(m4) +@@ -475,10 +475,12 @@ + [Defined if LOCAL_PEEREID is supported (NetBSD specific)]) + else + # (Open)Solaris +- AC_CHECK_FUNCS([getpeerucred], AC_CHECK_HEADERS([ucred.h])) ++ AC_CHECK_FUNCS([getpeerucred]) + if test $ac_cv_func_getpeerucred != yes; then + # FreeBSD + AC_CHECK_FUNCS([getpeereid]) ++ else ++ AC_CHECK_HEADERS([ucred.h]) + fi + fi + fi diff --git a/external/libassuan/rpath.patch b/external/libassuan/rpath.patch new file mode 100644 index 000000000..73c10e342 --- /dev/null +++ b/external/libassuan/rpath.patch @@ -0,0 +1,11 @@ +--- configure.ac ++++ configure.ac +@@ -127,6 +127,8 @@ + LT_INIT([win32-dll disable-static]) + LT_LANG([Windows Resource]) + ++hardcode_libdir_flag_spec= ++ + # For now we hardcode the use of version scripts. It would be better + # to write a test for this or even implement this within libtool. + have_ld_version_script=no diff --git a/external/libassuan/w32-build-fixes-2.patch b/external/libassuan/w32-build-fixes-2.patch new file mode 100644 index 000000000..918405d15 --- /dev/null +++ b/external/libassuan/w32-build-fixes-2.patch @@ -0,0 +1,12 @@ +Avoid MFC dependency - can go with very basic includes instead + +--- src/versioninfo.rc.in~ 2015-10-16 15:40:36.000000000 +0200 ++++ src/versioninfo.rc.in 2017-11-29 04:19:57.870117200 +0100 +@@ -14,7 +14,6 @@ + + #line __LINE__ "versioninfo.rc.in" + +-#include <afxres.h> + + + VS_VERSION_INFO VERSIONINFO diff --git a/external/libassuan/w32-build-fixes.patch.1 b/external/libassuan/w32-build-fixes.patch.1 new file mode 100644 index 000000000..b0dbbf841 --- /dev/null +++ b/external/libassuan/w32-build-fixes.patch.1 @@ -0,0 +1,64 @@ +--- libassuan/src/Makefile.am ++++ libassuan/src/Makefile.am +@@ -81,7 +81,7 @@ + + if HAVE_W32_SYSTEM + +-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \ ++LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \ + `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ + sed -e 's/-I/--include-dir /g;s/-D/--define /g'` + +--- libassuan.orig/src/mkheader.c 2013-03-15 20:26:09.000000000 +0100 ++++ libassuan/src/mkheader.c 2017-09-24 14:17:33.584583300 +0200 +@@ -99,7 +99,7 @@ + "# include <unistd.h>\n" + "#endif\n", stdout); + else +- fputs ("#include <unistd.h>\n", stdout); ++ fputs ("#include <io.h>\n", stdout); + } + else if (!strcmp (tag, "include:types")) + { +diff -ru libassuan.orig/src/Makefile.am libassuan/src/Makefile.am +--- libassuan.orig/src/Makefile.am 2017-09-24 14:20:05.906065400 +0200 ++++ libassuan/src/Makefile.am 2017-09-24 14:40:59.038850200 +0200 +@@ -142,11 +142,11 @@ + $(DESTDIR)$(bindir)/gpgcedev.dll + endif + +-mkheader: mkheader.c Makefile ++mkheader$(EXEEXT): mkheader.c Makefile + $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + +-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h) +- ./mkheader $(host_os) $(srcdir)/assuan.h.in \ ++assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h) ++ ./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \ + @VERSION@ @VERSION_NUMBER@ >$@ + + +diff -ru libassuan.orig/src/assuan-handler.c libassuan/src/assuan-handler.c +--- libassuan.orig/src/assuan-handler.c 2016-06-25 16:27:49.000000000 +0200 ++++ libassuan/src/assuan-handler.c 2017-09-24 15:32:51.200956200 +0200 +@@ -395,7 +395,7 @@ + + { "INPUT", std_handler_input, std_help_input, 0 }, + { "OUTPUT", std_handler_output, std_help_output, 0 }, +- { } }; ++}; + + + /** +diff -ru libassuan.orig/Makefile.am libassuan/Makefile.am +--- libassuan.orig/Makefile.am 2016-07-14 10:09:22.000000000 +0200 ++++ libassuan/Makefile.am 2017-09-25 21:20:19.928317500 +0200 +@@ -35,7 +35,7 @@ + doc = + endif + +-SUBDIRS = m4 src $(doc) tests ++SUBDIRS = m4 src $(doc) + + + dist-hook: gen-ChangeLog diff --git a/external/libatomic_ops/ExternalProject_libatomic_ops.mk b/external/libatomic_ops/ExternalProject_libatomic_ops.mk new file mode 100644 index 000000000..20cefa39b --- /dev/null +++ b/external/libatomic_ops/ExternalProject_libatomic_ops.mk @@ -0,0 +1,28 @@ +# -*- 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,libatomic_ops)) + +$(eval $(call gb_ExternalProject_use_autoconf,libatomic_ops,build)) + +$(eval $(call gb_ExternalProject_register_targets,libatomic_ops,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,libatomic_ops,build) : + $(call gb_Trace_StartRange,libatomic_ops,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))") \ + ./configure \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libatomic_ops,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libatomic_ops/Makefile b/external/libatomic_ops/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libatomic_ops/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/libatomic_ops/Module_libatomic_ops.mk b/external/libatomic_ops/Module_libatomic_ops.mk new file mode 100644 index 000000000..7dca6703c --- /dev/null +++ b/external/libatomic_ops/Module_libatomic_ops.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,libatomic_ops)) + +$(eval $(call gb_Module_add_targets,libatomic_ops,\ + ExternalProject_libatomic_ops \ + UnpackedTarball_libatomic_ops \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libatomic_ops/README b/external/libatomic_ops/README new file mode 100644 index 000000000..3dcb7ef7a --- /dev/null +++ b/external/libatomic_ops/README @@ -0,0 +1,4 @@ +From [https://github.com/ivmai/libatomic_ops/]. + +Note that some files (linked into libatomic_ops_gpl) are GPL'd, the portion +needed for Firebird (libatomic_ops) is however MIT licensed. diff --git a/external/libatomic_ops/UnpackedTarball_libatomic_ops.mk b/external/libatomic_ops/UnpackedTarball_libatomic_ops.mk new file mode 100644 index 000000000..652b8381a --- /dev/null +++ b/external/libatomic_ops/UnpackedTarball_libatomic_ops.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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libatomic_ops)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libatomic_ops,$(LIBATOMIC_OPS_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libatomic_ops)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk new file mode 100644 index 000000000..b3e78f469 --- /dev/null +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -0,0 +1,48 @@ +# -*- 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 \ + revenge \ + zlib \ +)) + +$(call gb_ExternalProject_get_state_target,libcdr,build) : + $(call gb_Trace_StartRange,libcdr,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-tools \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-werror \ + --disable-weffc \ + $(if $(gb_FULLDEPS),,--disable-dependency-tracking) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libcdr,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libcdr/Makefile b/external/libcdr/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libcdr/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/libcdr/Module_libcdr.mk b/external/libcdr/Module_libcdr.mk new file mode 100644 index 000000000..5f8acd374 --- /dev/null +++ b/external/libcdr/Module_libcdr.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,libcdr)) + +$(eval $(call gb_Module_add_targets,libcdr,\ + ExternalProject_libcdr \ + UnpackedTarball_libcdr \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libcdr/README b/external/libcdr/README new file mode 100644 index 000000000..4337b722b --- /dev/null +++ b/external/libcdr/README @@ -0,0 +1,3 @@ +Library parsing the Corel cdr documents. + +[https://wiki.documentfoundation.org/DLP/Libraries/libcdr] diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk new file mode 100644 index 000000000..fd227a2f7 --- /dev/null +++ b/external/libcdr/UnpackedTarball_libcdr.mk @@ -0,0 +1,22 @@ +# -*- 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_set_patchlevel,libcdr,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr)) + +$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \ + external/libcdr/libcdr-visibility-win.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libcdr/libcdr-visibility-win.patch b/external/libcdr/libcdr-visibility-win.patch new file mode 100644 index 000000000..7700cfd32 --- /dev/null +++ b/external/libcdr/libcdr-visibility-win.patch @@ -0,0 +1,11 @@ +--- configure.dt 2018-12-29 16:23:02.355271146 +0100 ++++ configure 2018-12-29 16:23:21.644060142 +0100 +@@ -19116,6 +19116,8 @@ + + + if test $platform_win32 = yes; then : ++ HAVE_VISIBILITY_TRUE='#' ++ HAVE_VISIBILITY_FALSE= + + else + diff --git a/external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch b/external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch new file mode 100644 index 000000000..f82c82f81 --- /dev/null +++ b/external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch @@ -0,0 +1,69 @@ +From 219e6d6586c8280dfd9c4851cee0d14d68b6ad65 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Fri, 28 Dec 2018 15:26:28 +0100 +Subject: [PATCH] rename class GetObject to avoid name clash on Windows + +--- + src/libcmis/ws-objectservice.cxx | 2 +- + src/libcmis/ws-requests.cxx | 2 +- + src/libcmis/ws-requests.hxx | 7 +++---- + 3 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/src/libcmis/ws-objectservice.cxx b/src/libcmis/ws-objectservice.cxx +index 9e40085..d57f3cc 100644 +--- a/src/libcmis/ws-objectservice.cxx ++++ b/src/libcmis/ws-objectservice.cxx +@@ -71,7 +71,7 @@ libcmis::ObjectPtr ObjectService::getObject( string repoId, string id ) + { + libcmis::ObjectPtr object; + +- class GetObject request( repoId, id ); ++ GetObjectRequest request( repoId, id ); + vector< SoapResponsePtr > responses = m_session->soapRequest( m_url, request ); + if ( responses.size( ) == 1 ) + { +diff --git a/src/libcmis/ws-requests.cxx b/src/libcmis/ws-requests.cxx +index f8bc245..408d053 100644 +--- a/src/libcmis/ws-requests.cxx ++++ b/src/libcmis/ws-requests.cxx +@@ -269,7 +269,7 @@ SoapResponsePtr GetTypeChildrenResponse::create( xmlNodePtr node, RelatedMultipa + return SoapResponsePtr( response ); + } + +-void GetObject::toXml( xmlTextWriterPtr writer ) ++void GetObjectRequest::toXml( xmlTextWriterPtr writer ) + { + xmlTextWriterStartElement( writer, BAD_CAST( "cmism:getObject" ) ); + xmlTextWriterWriteAttribute( writer, BAD_CAST( "xmlns:cmis" ), BAD_CAST( NS_CMIS_URL ) ); +diff --git a/src/libcmis/ws-requests.hxx b/src/libcmis/ws-requests.hxx +index 2c4ae92..534d9a4 100644 +--- a/src/libcmis/ws-requests.hxx ++++ b/src/libcmis/ws-requests.hxx +@@ -203,21 +203,20 @@ class GetTypeChildrenResponse : public SoapResponse + std::vector< libcmis::ObjectTypePtr > getChildren( ) { return m_children; } + }; + +-#undef GetObject +-class GetObject : public SoapRequest ++class GetObjectRequest : public SoapRequest + { + private: + std::string m_repositoryId; + std::string m_id; + + public: +- GetObject( std::string repoId, std::string id ) : ++ GetObjectRequest( std::string repoId, std::string id ) : + m_repositoryId( repoId ), + m_id( id ) + { + } + +- ~GetObject( ) { } ++ ~GetObjectRequest( ) { } + + void toXml( xmlTextWriterPtr writer ); + }; +-- +2.19.2 + diff --git a/external/libcmis/Makefile b/external/libcmis/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libcmis/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/libcmis/Module_libcmis.mk b/external/libcmis/Module_libcmis.mk new file mode 100644 index 000000000..78ab61c51 --- /dev/null +++ b/external/libcmis/Module_libcmis.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,libcmis)) + +$(eval $(call gb_Module_add_targets,libcmis,\ + StaticLibrary_libcmis \ + UnpackedTarball_libcmis \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libcmis/README b/external/libcmis/README new file mode 100644 index 000000000..8065e7c76 --- /dev/null +++ b/external/libcmis/README @@ -0,0 +1,8 @@ +A C++ client library for the CMIS interface. + +From: +[https://github.com/tdf/libcmis] + +Wikipedia (CMIS): +Content Management Interoperability Services (CMIS) is an open standard that defines an +abstraction layer for controlling diverse document management systems and repositories using web protocols. diff --git a/external/libcmis/StaticLibrary_libcmis.mk b/external/libcmis/StaticLibrary_libcmis.mk new file mode 100644 index 000000000..ebcd16607 --- /dev/null +++ b/external/libcmis/StaticLibrary_libcmis.mk @@ -0,0 +1,104 @@ +# -*- 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_StaticLibrary_StaticLibrary,libcmis)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,libcmis)) + +$(eval $(call gb_StaticLibrary_set_precompiled_header,libcmis,external/libcmis/inc/pch/precompiled_libcmis)) + +ifeq ($(COM_IS_CLANG),TRUE) +# Avoid narrowing conversion error (even though the option is technically a warning) +# caused by boost +$(eval $(call gb_StaticLibrary_add_cxxflags,libcmis,\ + -Wno-error=c++11-narrowing \ +)) +endif + +$(eval $(call gb_StaticLibrary_add_defs,libcmis, \ + -DBOOST_ALL_NO_LIB \ +)) + +$(eval $(call gb_StaticLibrary_set_include,libcmis, \ + -I$(call gb_UnpackedTarball_get_dir,libcmis/inc) \ + -I$(call gb_UnpackedTarball_get_dir,libcmis/src/libcmis) \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_use_unpacked,libcmis,libcmis)) + +$(eval $(call gb_StaticLibrary_use_externals,libcmis,\ + boost_headers \ + curl \ + libxml2 \ +)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,libcmis,\ + UnpackedTarball/libcmis/src/libcmis/allowable-actions \ + UnpackedTarball/libcmis/src/libcmis/atom-document \ + UnpackedTarball/libcmis/src/libcmis/atom-folder \ + UnpackedTarball/libcmis/src/libcmis/atom-object-type \ + UnpackedTarball/libcmis/src/libcmis/atom-object \ + UnpackedTarball/libcmis/src/libcmis/atom-session \ + UnpackedTarball/libcmis/src/libcmis/atom-workspace \ + UnpackedTarball/libcmis/src/libcmis/base-session \ + UnpackedTarball/libcmis/src/libcmis/document \ + UnpackedTarball/libcmis/src/libcmis/folder \ + UnpackedTarball/libcmis/src/libcmis/gdrive-document \ + UnpackedTarball/libcmis/src/libcmis/gdrive-folder \ + UnpackedTarball/libcmis/src/libcmis/gdrive-object \ + UnpackedTarball/libcmis/src/libcmis/gdrive-object-type \ + UnpackedTarball/libcmis/src/libcmis/gdrive-property \ + UnpackedTarball/libcmis/src/libcmis/gdrive-repository \ + UnpackedTarball/libcmis/src/libcmis/gdrive-session \ + UnpackedTarball/libcmis/src/libcmis/gdrive-utils \ + UnpackedTarball/libcmis/src/libcmis/http-session \ + UnpackedTarball/libcmis/src/libcmis/json-utils \ + UnpackedTarball/libcmis/src/libcmis/oauth2-data \ + UnpackedTarball/libcmis/src/libcmis/oauth2-handler \ + UnpackedTarball/libcmis/src/libcmis/oauth2-providers \ + UnpackedTarball/libcmis/src/libcmis/object \ + UnpackedTarball/libcmis/src/libcmis/object-type \ + UnpackedTarball/libcmis/src/libcmis/onedrive-document \ + UnpackedTarball/libcmis/src/libcmis/onedrive-folder \ + UnpackedTarball/libcmis/src/libcmis/onedrive-object \ + UnpackedTarball/libcmis/src/libcmis/onedrive-object-type \ + UnpackedTarball/libcmis/src/libcmis/onedrive-property \ + UnpackedTarball/libcmis/src/libcmis/onedrive-repository \ + UnpackedTarball/libcmis/src/libcmis/onedrive-session \ + UnpackedTarball/libcmis/src/libcmis/onedrive-utils \ + UnpackedTarball/libcmis/src/libcmis/property \ + UnpackedTarball/libcmis/src/libcmis/property-type \ + UnpackedTarball/libcmis/src/libcmis/rendition \ + UnpackedTarball/libcmis/src/libcmis/repository \ + UnpackedTarball/libcmis/src/libcmis/session-factory \ + UnpackedTarball/libcmis/src/libcmis/sharepoint-document \ + UnpackedTarball/libcmis/src/libcmis/sharepoint-folder \ + UnpackedTarball/libcmis/src/libcmis/sharepoint-object \ + UnpackedTarball/libcmis/src/libcmis/sharepoint-object-type \ + UnpackedTarball/libcmis/src/libcmis/sharepoint-property \ + UnpackedTarball/libcmis/src/libcmis/sharepoint-repository \ + UnpackedTarball/libcmis/src/libcmis/sharepoint-session \ + UnpackedTarball/libcmis/src/libcmis/sharepoint-utils \ + UnpackedTarball/libcmis/src/libcmis/ws-document \ + UnpackedTarball/libcmis/src/libcmis/ws-folder \ + UnpackedTarball/libcmis/src/libcmis/ws-navigationservice \ + UnpackedTarball/libcmis/src/libcmis/ws-object \ + UnpackedTarball/libcmis/src/libcmis/ws-object-type \ + UnpackedTarball/libcmis/src/libcmis/ws-objectservice \ + UnpackedTarball/libcmis/src/libcmis/ws-relatedmultipart \ + UnpackedTarball/libcmis/src/libcmis/ws-repositoryservice \ + UnpackedTarball/libcmis/src/libcmis/ws-requests \ + UnpackedTarball/libcmis/src/libcmis/ws-session \ + UnpackedTarball/libcmis/src/libcmis/ws-soap \ + UnpackedTarball/libcmis/src/libcmis/ws-versioningservice \ + UnpackedTarball/libcmis/src/libcmis/xml-utils \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libcmis/UnpackedTarball_libcmis.mk b/external/libcmis/UnpackedTarball_libcmis.mk new file mode 100644 index 000000000..c648a7b02 --- /dev/null +++ b/external/libcmis/UnpackedTarball_libcmis.mk @@ -0,0 +1,21 @@ +# -*- 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,libcmis)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libcmis,$(LIBCMIS_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libcmis,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,libcmis, \ + external/libcmis/libcmis-libxml2_compatibility.patch \ + external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libcmis/inc/pch/precompiled_libcmis.cxx b/external/libcmis/inc/pch/precompiled_libcmis.cxx new file mode 100644 index 000000000..13668b837 --- /dev/null +++ b/external/libcmis/inc/pch/precompiled_libcmis.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_libcmis.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libcmis/inc/pch/precompiled_libcmis.hxx b/external/libcmis/inc/pch/precompiled_libcmis.hxx new file mode 100644 index 000000000..a8a4b979f --- /dev/null +++ b/external/libcmis/inc/pch/precompiled_libcmis.hxx @@ -0,0 +1,70 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2019-05-18 14:55:22 using: + ./bin/update_pch external/libcmis libcmis --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/libcmis/inc/pch/precompiled_libcmis.hxx "make external/libcmis.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <algorithm> +#include <cctype> +#include <errno.h> +#include <locale> +#include <memory> +#include <sstream> +#include <stdlib.h> +#include <string> +#include <boost/algorithm/string.hpp> +#include <boost/date_time.hpp> +#include <boost/date_time/posix_time/posix_time.hpp> +#include <boost/property_tree/json_parser.hpp> +#include <boost/property_tree/ptree.hpp> +#include <boost/shared_ptr.hpp> +#include <boost/uuid/uuid_generators.hpp> +#include <boost/uuid/uuid_io.hpp> +#include <boost/version.hpp> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <curl/curl.h> +#include <libcmis/allowable-actions.hxx> +#include <libcmis/document.hxx> +#include <libcmis/exception.hxx> +#include <libcmis/folder.hxx> +#include <libcmis/oauth2-data.hxx> +#include <libcmis/object-type.hxx> +#include <libcmis/object.hxx> +#include <libcmis/property-type.hxx> +#include <libcmis/property.hxx> +#include <libcmis/rendition.hxx> +#include <libcmis/repository.hxx> +#include <libcmis/session-factory.hxx> +#include <libcmis/session.hxx> +#include <libcmis/xml-utils.hxx> +#include <libxml/HTMLparser.h> +#include <libxml/parser.h> +#include <libxml/tree.h> +#include <libxml/xmlreader.h> +#include <libxml/xmlstring.h> +#include <libxml/xpath.h> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libcmis/libcmis-libxml2_compatibility.patch b/external/libcmis/libcmis-libxml2_compatibility.patch new file mode 100644 index 000000000..240b85b4d --- /dev/null +++ b/external/libcmis/libcmis-libxml2_compatibility.patch @@ -0,0 +1,14 @@ +# -*- Mode: Diff -*- +--- a/src/libcmis/oauth2-providers.cxx ++++ b/src/libcmis/oauth2-providers.cxx +@@ -34,6 +34,10 @@ + + using namespace std; + ++#if LIBXML_VERSION < 20621 ++#define HTML_PARSE_RECOVER 0 ++#endif ++ + namespace { + + // Encodes the given data according to the application/x-www-form-urlencoded format, see diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk new file mode 100644 index 000000000..8ee2c7293 --- /dev/null +++ b/external/libebook/ExternalProject_libebook.mk @@ -0,0 +1,53 @@ +# -*- 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,libebook)) + +$(eval $(call gb_ExternalProject_use_autoconf,libebook,build)) + +$(eval $(call gb_ExternalProject_register_targets,libebook,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libebook,\ + boost_headers \ + icu \ + liblangtag \ + libxml2 \ + revenge \ + zlib \ +)) + +$(call gb_ExternalProject_get_state_target,libebook,build) : + $(call gb_Trace_StartRange,libebook,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --without-tools \ + --disable-tests \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + --disable-werror \ + --disable-weffc \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \ + LANGTAG_CFLAGS="$(LIBLANGTAG_CFLAGS)" \ + LANGTAG_LIBS="$(LIBLANGTAG_LIBS)" \ + XML_CFLAGS="$(LIBXML_CFLAGS)" \ + XML_LIBS="$(LIBXML_LIBS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libebook,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libebook/Makefile b/external/libebook/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libebook/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/libebook/Module_libebook.mk b/external/libebook/Module_libebook.mk new file mode 100644 index 000000000..cbc74f109 --- /dev/null +++ b/external/libebook/Module_libebook.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,libebook)) + +$(eval $(call gb_Module_add_targets,libebook,\ + ExternalProject_libebook \ + UnpackedTarball_libebook \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libebook/README b/external/libebook/README new file mode 100644 index 000000000..804de5c1b --- /dev/null +++ b/external/libebook/README @@ -0,0 +1,3 @@ +Library for import of various non-HTML reflowable e-book formats. + +[https://sourceforge.net/projects/libebook/] diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk new file mode 100644 index 000000000..0b0658652 --- /dev/null +++ b/external/libebook/UnpackedTarball_libebook.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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libebook)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libebook)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libeot/ExternalProject_libeot.mk b/external/libeot/ExternalProject_libeot.mk new file mode 100644 index 000000000..75e8054a0 --- /dev/null +++ b/external/libeot/ExternalProject_libeot.mk @@ -0,0 +1,31 @@ +# -*- 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,libeot)) + +$(eval $(call gb_ExternalProject_register_targets,libeot,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,libeot,build) : + $(call gb_Trace_StartRange,libeot,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + touch Makefile.in \ + && export PKG_CONFIG="" \ + && ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --disable-debug \ + CFLAGS='$(filter-out -std=gnu89,$(CFLAGS))' \ + && $(MAKE) $(if $(verbose),V=1) \ + ) + $(call gb_Trace_EndRange,libeot,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libeot/Makefile b/external/libeot/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libeot/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/libeot/Module_libeot.mk b/external/libeot/Module_libeot.mk new file mode 100644 index 000000000..128b255d1 --- /dev/null +++ b/external/libeot/Module_libeot.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,libeot)) + +$(eval $(call gb_Module_add_targets,libeot,\ + ExternalProject_libeot \ + UnpackedTarball_libeot \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libeot/README b/external/libeot/README new file mode 100644 index 000000000..fc317f43d --- /dev/null +++ b/external/libeot/README @@ -0,0 +1,2 @@ +Library for parsing Embedded OpenType files (Microsoft embedded font +"standard"), and converting them to other formats. diff --git a/external/libeot/UnpackedTarball_libeot.mk b/external/libeot/UnpackedTarball_libeot.mk new file mode 100644 index 000000000..cbd1a69aa --- /dev/null +++ b/external/libeot/UnpackedTarball_libeot.mk @@ -0,0 +1,14 @@ +# -*- 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,libeot)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libeot,$(LIBEOT_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/libepubgen/ExternalProject_libepubgen.mk b/external/libepubgen/ExternalProject_libepubgen.mk new file mode 100644 index 000000000..54a9a3d68 --- /dev/null +++ b/external/libepubgen/ExternalProject_libepubgen.mk @@ -0,0 +1,42 @@ +# -*- 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,libepubgen)) + +$(eval $(call gb_ExternalProject_use_autoconf,libepubgen,build)) + +$(eval $(call gb_ExternalProject_register_targets,libepubgen,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libepubgen,\ + boost_headers \ + revenge \ +)) + +$(call gb_ExternalProject_get_state_target,libepubgen,build) : + $(call gb_Trace_StartRange,libepubgen,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-werror \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libepubgen,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libepubgen/Makefile b/external/libepubgen/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libepubgen/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/libepubgen/Module_libepubgen.mk b/external/libepubgen/Module_libepubgen.mk new file mode 100644 index 000000000..a0ed770be --- /dev/null +++ b/external/libepubgen/Module_libepubgen.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,libepubgen)) + +$(eval $(call gb_Module_add_targets,libepubgen,\ + ExternalProject_libepubgen \ + UnpackedTarball_libepubgen \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libepubgen/README b/external/libepubgen/README new file mode 100644 index 000000000..4d1dca7f8 --- /dev/null +++ b/external/libepubgen/README @@ -0,0 +1,3 @@ +An EPUB generator library for librevenge from + +[https://sourceforge.net/projects/libepubgen/] diff --git a/external/libepubgen/UnpackedTarball_libepubgen.mk b/external/libepubgen/UnpackedTarball_libepubgen.mk new file mode 100644 index 000000000..3c505ea1b --- /dev/null +++ b/external/libepubgen/UnpackedTarball_libepubgen.mk @@ -0,0 +1,25 @@ +# -*- 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/. +# + +epubgen_patches := +epubgen_patches += tdf-120491.patch + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libepubgen)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libepubgen,$(EPUBGEN_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libepubgen)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libepubgen,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,libepubgen,\ + $(foreach patch,$(epubgen_patches),external/libepubgen/$(patch)) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libepubgen/tdf-120491.patch b/external/libepubgen/tdf-120491.patch new file mode 100644 index 000000000..2a02a66e4 --- /dev/null +++ b/external/libepubgen/tdf-120491.patch @@ -0,0 +1,33 @@ +From 92760e4b0b8da126029c5ff858ebec27df4acfa8 Mon Sep 17 00:00:00 2001 +Subject: [PATCH] tdf#120491 EPUBHTMLGenerator: remove not needed <meta + content="text/html..."> + +IngramSpark flags this as an error, and not writing it still passes +epubcheck. +--- + src/lib/EPUBHTMLGenerator.cpp | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp +index a950ea5..f6c2527 100644 +--- src/lib/EPUBHTMLGenerator.cpp ++++ src/lib/EPUBHTMLGenerator.cpp +@@ -579,14 +579,9 @@ void EPUBHTMLGenerator::endDocument() + m_impl->m_document.openElement("title", RVNGPropertyList()); + m_impl->m_document.closeElement("title"); + } +- RVNGPropertyList metaAttrs; +- metaAttrs.insert("http-equiv", "content-type"); +- metaAttrs.insert("content", "text/html; charset=UTF-8"); +- m_impl->m_document.openElement("meta", metaAttrs); +- m_impl->m_document.closeElement("meta"); + if (m_impl->m_version >= 30 && m_impl->m_layoutMethod == EPUB_LAYOUT_METHOD_FIXED) + { +- metaAttrs.clear(); ++ RVNGPropertyList metaAttrs; + metaAttrs.insert("name", "viewport"); + std::stringstream content; + if (const librevenge::RVNGProperty *pageWidth = m_impl->m_actualPageProperties["fo:page-width"]) +-- +2.16.4 + diff --git a/external/libetonyek/ExternalPackage_libetonyek.mk b/external/libetonyek/ExternalPackage_libetonyek.mk new file mode 100644 index 000000000..98d4763c8 --- /dev/null +++ b/external/libetonyek/ExternalPackage_libetonyek.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,libetonyek,libetonyek)) + +$(eval $(call gb_ExternalPackage_use_external_project,libetonyek,libetonyek)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.1.dylib,src/lib/.libs/libetonyek-0.1.1.dylib)) +else ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.dll,src/lib/.libs/libetonyek-0.1.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1-lo.so.1,src/lib/.libs/libetonyek-0.1-lo.so.1.0.$(ETONYEK_VERSION_MICRO))) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk new file mode 100644 index 000000000..0eabfe5f4 --- /dev/null +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -0,0 +1,67 @@ +# -*- 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,libetonyek)) + +$(eval $(call gb_ExternalProject_use_autoconf,libetonyek,build)) + +$(eval $(call gb_ExternalProject_register_targets,libetonyek,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libetonyek,\ + boost_headers \ + glm_headers \ + liblangtag \ + libxml2 \ + mdds_headers \ + revenge \ + zlib \ +)) + +$(call gb_ExternalProject_get_state_target,libetonyek,build) : + $(call gb_Trace_StartRange,libetonyek,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + --without-docs \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-tests \ + --disable-werror \ + --disable-weffc \ + --without-tools \ + --with-mdds=1.0 \ + $(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P="$(shell cygpath -m /usr/bin/mkdir) -p") \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(filter LINUX,$(OS)), \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + LANGTAG_CFLAGS="$(LIBLANGTAG_CFLAGS)" \ + LANGTAG_LIBS="$(LIBLANGTAG_LIBS)" \ + XML_CFLAGS="$(LIBXML_CFLAGS)" \ + XML_LIBS="$(LIBXML_LIBS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/lib/.libs/libetonyek-0.1.1.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,libetonyek,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/Library_etonyek.mk b/external/libetonyek/Library_etonyek.mk new file mode 100644 index 000000000..cbbe08458 --- /dev/null +++ b/external/libetonyek/Library_etonyek.mk @@ -0,0 +1,192 @@ +# -*- 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_Library_Library,etonyek)) + +$(eval $(call gb_Library_use_unpacked,etonyek,libetonyek)) + +$(eval $(call gb_Library_use_externals,etonyek,\ + boost_headers \ + glm_headers \ + liblangtag \ + libxml2 \ + mdds_headers \ + revenge \ + zlib \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,etonyek)) + +$(eval $(call gb_Library_set_precompiled_header,etonyek,external/libetonyek/inc/pch/precompiled_etonyek)) + +$(eval $(call gb_Library_set_include,etonyek,\ + -I$(call gb_UnpackedTarball_get_dir,libetonyek)/inc \ + -I$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib \ + -I$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib/contexts \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,etonyek,\ + -DBOOST_ALL_NO_LIB \ + -DDLL_EXPORT \ + -DLIBETONYEK_BUILD \ + -DNDEBUG \ +)) + +$(eval $(call gb_Library_set_generated_cxx_suffix,etonyek,cpp)) + +$(eval $(call gb_Library_add_generated_exception_objects,etonyek,\ + UnpackedTarball/libetonyek/src/lib/EtonyekDocument \ + UnpackedTarball/libetonyek/src/lib/IWAField \ + UnpackedTarball/libetonyek/src/lib/IWAMessage \ + UnpackedTarball/libetonyek/src/lib/IWAObjectIndex \ + UnpackedTarball/libetonyek/src/lib/IWAParser \ + UnpackedTarball/libetonyek/src/lib/IWAReader \ + UnpackedTarball/libetonyek/src/lib/IWASnappyStream \ + UnpackedTarball/libetonyek/src/lib/IWAText \ + UnpackedTarball/libetonyek/src/lib/IWORKChainedTokenizer \ + UnpackedTarball/libetonyek/src/lib/IWORKChart \ + UnpackedTarball/libetonyek/src/lib/IWORKCollector \ + UnpackedTarball/libetonyek/src/lib/IWORKDictionary \ + UnpackedTarball/libetonyek/src/lib/IWORKDiscardContext \ + UnpackedTarball/libetonyek/src/lib/IWORKDocumentInterface \ + UnpackedTarball/libetonyek/src/lib/IWORKFormula \ + UnpackedTarball/libetonyek/src/lib/IWORKLanguageManager \ + UnpackedTarball/libetonyek/src/lib/IWORKMemoryStream \ + UnpackedTarball/libetonyek/src/lib/IWORKOutputElements \ + UnpackedTarball/libetonyek/src/lib/IWORKOutputManager \ + UnpackedTarball/libetonyek/src/lib/IWORKParser \ + UnpackedTarball/libetonyek/src/lib/IWORKPath \ + UnpackedTarball/libetonyek/src/lib/IWORKPresentationRedirector \ + UnpackedTarball/libetonyek/src/lib/IWORKProperties \ + UnpackedTarball/libetonyek/src/lib/IWORKPropertyHandler \ + UnpackedTarball/libetonyek/src/lib/IWORKPropertyMap \ + UnpackedTarball/libetonyek/src/lib/IWORKRecorder \ + UnpackedTarball/libetonyek/src/lib/IWORKShape \ + UnpackedTarball/libetonyek/src/lib/IWORKSpreadsheetRedirector \ + UnpackedTarball/libetonyek/src/lib/IWORKStyle \ + UnpackedTarball/libetonyek/src/lib/IWORKStyleStack \ + UnpackedTarball/libetonyek/src/lib/IWORKStylesheet \ + UnpackedTarball/libetonyek/src/lib/IWORKSubDirStream \ + UnpackedTarball/libetonyek/src/lib/IWORKTable \ + UnpackedTarball/libetonyek/src/lib/IWORKTableRecorder \ + UnpackedTarball/libetonyek/src/lib/IWORKText \ + UnpackedTarball/libetonyek/src/lib/IWORKTextRecorder \ + UnpackedTarball/libetonyek/src/lib/IWORKTextRedirector \ + UnpackedTarball/libetonyek/src/lib/IWORKToken \ + UnpackedTarball/libetonyek/src/lib/IWORKTokenizer \ + UnpackedTarball/libetonyek/src/lib/IWORKTokenizerBase \ + UnpackedTarball/libetonyek/src/lib/IWORKTransformation \ + UnpackedTarball/libetonyek/src/lib/IWORKTypes \ + UnpackedTarball/libetonyek/src/lib/IWORKXMLContext \ + UnpackedTarball/libetonyek/src/lib/IWORKXMLContextBase \ + UnpackedTarball/libetonyek/src/lib/IWORKXMLParserState \ + UnpackedTarball/libetonyek/src/lib/IWORKZlibStream \ + UnpackedTarball/libetonyek/src/lib/KEY1Dictionary \ + UnpackedTarball/libetonyek/src/lib/KEY1Parser \ + UnpackedTarball/libetonyek/src/lib/KEY1ParserState \ + UnpackedTarball/libetonyek/src/lib/KEY1Token \ + UnpackedTarball/libetonyek/src/lib/KEY2Dictionary \ + UnpackedTarball/libetonyek/src/lib/KEY2Parser \ + UnpackedTarball/libetonyek/src/lib/KEY2ParserState \ + UnpackedTarball/libetonyek/src/lib/KEY2Token \ + UnpackedTarball/libetonyek/src/lib/KEY6Parser \ + UnpackedTarball/libetonyek/src/lib/KEYCollector \ + UnpackedTarball/libetonyek/src/lib/KEYProperties \ + UnpackedTarball/libetonyek/src/lib/KEYTypes \ + UnpackedTarball/libetonyek/src/lib/NUM1Dictionary \ + UnpackedTarball/libetonyek/src/lib/NUM1Parser \ + UnpackedTarball/libetonyek/src/lib/NUM1ParserState \ + UnpackedTarball/libetonyek/src/lib/NUM1Token \ + UnpackedTarball/libetonyek/src/lib/NUM3Parser \ + UnpackedTarball/libetonyek/src/lib/NUMCollector \ + UnpackedTarball/libetonyek/src/lib/PAG1Dictionary \ + UnpackedTarball/libetonyek/src/lib/PAG1Parser \ + UnpackedTarball/libetonyek/src/lib/PAG1ParserState \ + UnpackedTarball/libetonyek/src/lib/PAG1Token \ + UnpackedTarball/libetonyek/src/lib/PAG5Parser \ + UnpackedTarball/libetonyek/src/lib/PAGCollector \ + UnpackedTarball/libetonyek/src/lib/PAGProperties \ + UnpackedTarball/libetonyek/src/lib/PAGTypes \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKBezierElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKBinaryElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKBrContext \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKCalcEngineContext \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKChartInfoElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKColorElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKCoreImageFilterDescriptorElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKDataElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKFieldElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKFillElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKFilteredImageElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKFormatElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKFormulaElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKGeometryElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKGroupElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKHeaderFooterContext \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKImageContext \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKImageElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKLayoutElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKLineElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKLineEndElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKLinkElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelGeometriesProperty \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelGeometryElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelIndentsProperty \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelTypeinfoElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKListLabelTypesProperty \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKListTextIndentsProperty \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKMediaElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKMetadataElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKNumberConverter \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKPElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKPathElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKPositionElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKPropertyContextBase \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKPropertyMapElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKRefContext \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKShapeContext \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKSizeElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKSpanElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKStringElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKStrokeContext \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKStyleContext \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKStyleRefContext \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKStylesContext \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKStylesheetBase \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKTableInfoElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabsElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabularInfoElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabularModelElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextBodyElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextLabelElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextStorageElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKUnfilteredElement \ + UnpackedTarball/libetonyek/src/lib/contexts/IWORKWrapElement \ + UnpackedTarball/libetonyek/src/lib/contexts/KEY1ContentElement \ + UnpackedTarball/libetonyek/src/lib/contexts/KEY1DivElement \ + UnpackedTarball/libetonyek/src/lib/contexts/KEY1FillElement \ + UnpackedTarball/libetonyek/src/lib/contexts/KEY1SpanElement \ + UnpackedTarball/libetonyek/src/lib/contexts/KEY1StringConverter \ + UnpackedTarball/libetonyek/src/lib/contexts/KEY1StylesContext \ + UnpackedTarball/libetonyek/src/lib/contexts/KEY1TableElement \ + UnpackedTarball/libetonyek/src/lib/contexts/KEY2StyleContext \ + UnpackedTarball/libetonyek/src/lib/contexts/PAG1AnnotationContext \ + UnpackedTarball/libetonyek/src/lib/contexts/PAG1AnnotationElement \ + UnpackedTarball/libetonyek/src/lib/contexts/PAG1FootnotesElement \ + UnpackedTarball/libetonyek/src/lib/contexts/PAG1ShapeContext \ + UnpackedTarball/libetonyek/src/lib/contexts/PAG1StyleContext \ + UnpackedTarball/libetonyek/src/lib/contexts/PAG1TextStorageElement \ + UnpackedTarball/libetonyek/src/lib/libetonyek_utils \ + UnpackedTarball/libetonyek/src/lib/libetonyek_xml \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/Makefile b/external/libetonyek/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libetonyek/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/libetonyek/Module_libetonyek.mk b/external/libetonyek/Module_libetonyek.mk new file mode 100644 index 000000000..94fd6ca0d --- /dev/null +++ b/external/libetonyek/Module_libetonyek.mk @@ -0,0 +1,31 @@ +# -*- 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,libetonyek)) + +$(eval $(call gb_Module_add_targets,libetonyek,\ + UnpackedTarball_libetonyek \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,libetonyek,\ + Library_etonyek \ +)) + +else + +$(eval $(call gb_Module_add_targets,libetonyek,\ + ExternalPackage_libetonyek \ + ExternalProject_libetonyek \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/README b/external/libetonyek/README new file mode 100644 index 000000000..5fe625372 --- /dev/null +++ b/external/libetonyek/README @@ -0,0 +1,3 @@ +Library for import of Apple Keynote presentations. + +[https://wiki.documentfoundation.org/DLP/Libraries/libetonyek] diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk new file mode 100644 index 000000000..5e7780deb --- /dev/null +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -0,0 +1,36 @@ +# -*- 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,libetonyek)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libetonyek)) + +$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ + external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 \ + external/libetonyek/win_build.patch.1 \ + external/libetonyek/ubsan.patch \ + external/libetonyek/rpath.patch \ + external/libetonyek/warnings.patch \ +)) + +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +ifneq ($(OS),iOS) +$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ + external/libetonyek/libetonyek-bundled-soname.patch.0 \ +)) +endif +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 b/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 new file mode 100644 index 000000000..1add51828 --- /dev/null +++ b/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 @@ -0,0 +1,62 @@ +From 548c2735c09570726f08d5ae9fee8efefb54d529 Mon Sep 17 00:00:00 2001 +From: osnola <alonso@loria.fr> +Date: Sun, 31 Mar 2019 09:34:11 +0200 +Subject: [PATCH] glm: force dmat3 initialization (needed from v0.9.9.0) + +Change-Id: I2cb285f2d9bc1e9818ed946b38caaf8a5de9e61a +Reviewed-on: https://gerrit.libreoffice.org/69993 +Reviewed-by: Laurent Alonso(fr) <alonso.laurent@gmail.com> +Tested-by: Laurent Alonso(fr) <alonso.laurent@gmail.com> +--- + src/lib/IWORKCollector.cpp | 6 +++--- + src/lib/KEYCollector.cpp | 3 +-- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp +index 41a9c79..794b462 100644 +--- a/src/lib/IWORKCollector.cpp ++++ b/src/lib/IWORKCollector.cpp +@@ -183,8 +183,8 @@ private: + IWORKCollector::Level::Level() + : m_geometry() + , m_graphicStyle() +- , m_trafo() +- , m_previousTrafo() ++ , m_trafo(1) ++ , m_previousTrafo(1) + { + } + +@@ -601,7 +601,7 @@ void IWORKCollector::startLevel() + return; + } + +- glm::dmat3 currentTrafo, prevTrafo; ++ glm::dmat3 currentTrafo(1), prevTrafo(1); + if (!m_levelStack.empty()) + { + currentTrafo = m_levelStack.top().m_trafo; +diff --git a/src/lib/KEYCollector.cpp b/src/lib/KEYCollector.cpp +index a9d8cc3..08e7e69 100644 +--- a/src/lib/KEYCollector.cpp ++++ b/src/lib/KEYCollector.cpp +@@ -167,7 +167,7 @@ void KEYCollector::insertTextPlaceholder(const KEYPlaceholderPtr_t &placeholder) + { + if (bool(placeholder)) + { +- glm::dmat3 trafo; ++ glm::dmat3 trafo(1); + if (bool(placeholder->m_geometry)) + trafo = makeTransformation(*placeholder->m_geometry); + trafo *= m_levelStack.top().m_trafo; +@@ -417,7 +417,6 @@ void KEYCollector::drawTextBox(const IWORKTextPtr_t &text, const glm::dmat3 &tra + double w = boundingBox->m_naturalSize.m_width; + double h = boundingBox->m_naturalSize.m_height; + vec = trafo * glm::dvec3(w, h, 0); +- + if (vec[0]>0) + props.insert("svg:width", pt2in(vec[0])); + if (vec[1]>0) +-- +2.24.1 + diff --git a/external/libetonyek/inc/pch/precompiled_etonyek.cxx b/external/libetonyek/inc/pch/precompiled_etonyek.cxx new file mode 100644 index 000000000..56f4f6a2e --- /dev/null +++ b/external/libetonyek/inc/pch/precompiled_etonyek.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_etonyek.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libetonyek/inc/pch/precompiled_etonyek.hxx b/external/libetonyek/inc/pch/precompiled_etonyek.hxx new file mode 100644 index 000000000..9af8b1c25 --- /dev/null +++ b/external/libetonyek/inc/pch/precompiled_etonyek.hxx @@ -0,0 +1,79 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2019-05-18 15:09:41 using: + ./bin/update_pch external/libetonyek etonyek --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/libetonyek/inc/pch/precompiled_etonyek.hxx "make external/libetonyek.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <algorithm> +#include <cassert> +#include <cmath> +#include <cstdarg> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> +#include <deque> +#include <functional> +#include <iomanip> +#include <iterator> +#include <libetonyek_utils.h> +#include <libetonyek_xml.h> +#include <limits> +#include <map> +#include <memory> +#include <set> +#include <sstream> +#include <stack> +#include <stdexcept> +#include <string> +#include <utility> +#include <vector> +#include <zlib.h> +#include <boost/algorithm/string/predicate.hpp> +#include <boost/fusion/adapted/std_pair.hpp> +#include <boost/fusion/include/adapt_struct.hpp> +#include <boost/fusion/include/std_pair.hpp> +#include <boost/lexical_cast.hpp> +#include <boost/none.hpp> +#include <boost/numeric/conversion/cast.hpp> +#include <boost/optional.hpp> +#include <boost/spirit/include/phoenix.hpp> +#include <boost/spirit/include/qi.hpp> +#include <boost/spirit/include/qi_attr.hpp> +#include <boost/spirit/include/qi_lit.hpp> +#include <boost/spirit/include/qi_optional.hpp> +#include <boost/spirit/include/qi_parse_attr.hpp> +#include <boost/spirit/include/qi_sequence.hpp> +#include <boost/spirit/include/qi_symbols.hpp> +#include <boost/variant.hpp> +#include <boost/variant/recursive_variant.hpp> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <glm/glm.hpp> +#include <libetonyek/libetonyek.h> +#include <librevenge/librevenge.h> +#include <libxml/xmlreader.h> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 b/external/libetonyek/libetonyek-bundled-soname.patch.0 new file mode 100644 index 000000000..15a58fa83 --- /dev/null +++ b/external/libetonyek/libetonyek-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2016-01-12 19:21:24.000000000 +0100 ++++ src/lib/Makefile.in 2016-03-02 18:19:52.214551270 +0100 +@@ -538,7 +538,7 @@ + $(XML_CFLAGS) $(ZLIB_CFLAGS) $(DEBUG_CXXFLAGS) $(am__append_1) + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) @LIBETONYEK_WIN32_RESOURCE@ + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@ +-libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \ + EtonyekDocument.cpp + diff --git a/external/libetonyek/rpath.patch b/external/libetonyek/rpath.patch new file mode 100644 index 000000000..3a6280597 --- /dev/null +++ b/external/libetonyek/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -14451,6 +14451,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) diff --git a/external/libetonyek/ubsan.patch b/external/libetonyek/ubsan.patch new file mode 100644 index 000000000..260e9f33d --- /dev/null +++ b/external/libetonyek/ubsan.patch @@ -0,0 +1,11 @@ +--- src/lib/libetonyek_xml.cpp ++++ src/lib/libetonyek_xml.cpp +@@ -35,7 +35,7 @@ + unsigned long bytesRead = 0; + const unsigned char *const bytes = input->read((unsigned long)len, bytesRead); + +- std::memcpy(buffer, bytes, static_cast<size_t>(bytesRead)); ++ if (bytesRead != 0) std::memcpy(buffer, bytes, static_cast<size_t>(bytesRead)); + return static_cast<int>(bytesRead); + } + catch (...) diff --git a/external/libetonyek/warnings.patch b/external/libetonyek/warnings.patch new file mode 100644 index 000000000..841d70cb6 --- /dev/null +++ b/external/libetonyek/warnings.patch @@ -0,0 +1,11 @@ +--- src/lib/IWORKXMLContext.cpp ++++ src/lib/IWORKXMLContext.cpp +@@ -18,7 +18,7 @@ + { + } + +-void IWORKXMLContext::CDATA(const char */*value*/) ++void IWORKXMLContext::CDATA(const char * /*value*/) + { + ETONYEK_DEBUG_MSG(("IWORKXMLContext::cData: find unexpected CDATA block\n")); + } diff --git a/external/libetonyek/win_build.patch.1 b/external/libetonyek/win_build.patch.1 new file mode 100644 index 000000000..a357737d8 --- /dev/null +++ b/external/libetonyek/win_build.patch.1 @@ -0,0 +1,13 @@ +Fix the windows build - fix libtool + +--- libetonyek/ltmain.sh.orig 2015-05-20 00:47:55.378800000 +0200 ++++ libetonyek/ltmain.sh 2015-05-20 00:47:33.648000000 +0200 +@@ -3722,6 +3722,8 @@ + sleep 2 + done + fi ++ # Cygwin ar.exe does not create directories for the objects! ++ mkdir -p $f_ex_an_ar_dir/contexts + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test yes = "$lock_old_archive_extraction"; then diff --git a/external/libexttextcat/ExternalPackage_fingerprint.mk b/external/libexttextcat/ExternalPackage_fingerprint.mk new file mode 100644 index 000000000..016446a2a --- /dev/null +++ b/external/libexttextcat/ExternalPackage_fingerprint.mk @@ -0,0 +1,179 @@ +# -*- 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_ExternalPackage_ExternalPackage,libexttextcat_fingerprint,libexttextcat)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(LIBO_SHARE_FOLDER)/fingerprint,\ + langclass/fpdb.conf \ + langclass/LM/ab.lm \ + langclass/LM/ace.lm \ + langclass/LM/ada.lm \ + langclass/LM/af.lm \ + langclass/LM/ak.lm \ + langclass/LM/alt.lm \ + langclass/LM/am.lm \ + langclass/LM/ar.lm \ + langclass/LM/arn.lm \ + langclass/LM/ast.lm \ + langclass/LM/ay.lm \ + langclass/LM/az-Cyrl.lm \ + langclass/LM/az.lm \ + langclass/LM/ban.lm \ + langclass/LM/be.lm \ + langclass/LM/bem.lm \ + langclass/LM/bg.lm \ + langclass/LM/bho.lm \ + langclass/LM/bi.lm \ + langclass/LM/bik.lm \ + langclass/LM/bm.lm \ + langclass/LM/bn.lm \ + langclass/LM/bo.lm \ + langclass/LM/br.lm \ + langclass/LM/bs.lm \ + langclass/LM/ca.lm \ + langclass/LM/ckb.lm \ + langclass/LM/cs.lm \ + langclass/LM/cy.lm \ + langclass/LM/da.lm \ + langclass/LM/de.lm \ + langclass/LM/dv.lm \ + langclass/LM/ee.lm \ + langclass/LM/el.lm \ + langclass/LM/emk-Latn.lm \ + langclass/LM/en.lm \ + langclass/LM/eo.lm \ + langclass/LM/es.lm \ + langclass/LM/et.lm \ + langclass/LM/eu.lm \ + langclass/LM/fa.lm \ + langclass/LM/fi.lm \ + langclass/LM/fj.lm \ + langclass/LM/fo.lm \ + langclass/LM/fr.lm \ + langclass/LM/fur.lm \ + langclass/LM/fy.lm \ + langclass/LM/ga.lm \ + langclass/LM/gd.lm \ + langclass/LM/gl.lm \ + langclass/LM/grc.lm \ + langclass/LM/gu.lm \ + langclass/LM/gug.lm \ + langclass/LM/gv.lm \ + langclass/LM/ha-NG.lm \ + langclass/LM/haw.lm \ + langclass/LM/he.lm \ + langclass/LM/hi.lm \ + langclass/LM/hil.lm \ + langclass/LM/hr.lm \ + langclass/LM/hsb.lm \ + langclass/LM/ht.lm \ + langclass/LM/hu.lm \ + langclass/LM/hy.lm \ + langclass/LM/ia.lm \ + langclass/LM/id.lm \ + langclass/LM/is.lm \ + langclass/LM/it.lm \ + langclass/LM/ja.lm \ + langclass/LM/ka.lm \ + langclass/LM/kk.lm \ + langclass/LM/kl.lm \ + langclass/LM/km.lm \ + langclass/LM/kn.lm \ + langclass/LM/kng.lm \ + langclass/LM/ko.lm \ + langclass/LM/ktu.lm \ + langclass/LM/ky.lm \ + langclass/LM/la.lm \ + langclass/LM/lb.lm \ + langclass/LM/lg.lm \ + langclass/LM/ln.lm \ + langclass/LM/lo.lm \ + langclass/LM/lt.lm \ + langclass/LM/lv.lm \ + langclass/LM/mai.lm \ + langclass/LM/mi.lm \ + langclass/LM/mk.lm \ + langclass/LM/ml.lm \ + langclass/LM/mn.lm \ + langclass/LM/mos.lm \ + langclass/LM/mr.lm \ + langclass/LM/ms.lm \ + langclass/LM/mt.lm \ + langclass/LM/my.lm \ + langclass/LM/nb.lm \ + langclass/LM/nds.lm \ + langclass/LM/ne.lm \ + langclass/LM/nl.lm \ + langclass/LM/nn.lm \ + langclass/LM/nr.lm \ + langclass/LM/nso.lm \ + langclass/LM/ny.lm \ + langclass/LM/oc.lm \ + langclass/LM/om.lm \ + langclass/LM/pa.lm \ + langclass/LM/pl.lm \ + langclass/LM/plt.lm \ + langclass/LM/pt.lm \ + langclass/LM/quz.lm \ + langclass/LM/qxa.lm \ + langclass/LM/rm.lm \ + langclass/LM/ro.lm \ + langclass/LM/ru.lm \ + langclass/LM/rue.lm \ + langclass/LM/rw.lm \ + langclass/LM/sa.lm \ + langclass/LM/sc.lm \ + langclass/LM/sco.lm \ + langclass/LM/sd.lm \ + langclass/LM/se.lm \ + langclass/LM/sg.lm \ + langclass/LM/shs.lm \ + langclass/LM/si.lm \ + langclass/LM/sk.lm \ + langclass/LM/sl.lm \ + langclass/LM/so.lm \ + langclass/LM/sq.lm \ + langclass/LM/sr-Cyrl.lm \ + langclass/LM/sr-Latn.lm \ + langclass/LM/ss.lm \ + langclass/LM/st.lm \ + langclass/LM/sv.lm \ + langclass/LM/sw.lm \ + langclass/LM/ta.lm \ + langclass/LM/tet.lm \ + langclass/LM/tg.lm \ + langclass/LM/th.lm \ + langclass/LM/ti.lm \ + langclass/LM/tk.lm \ + langclass/LM/tl.lm \ + langclass/LM/tn.lm \ + langclass/LM/tpi.lm \ + langclass/LM/tr.lm \ + langclass/LM/ts.lm \ + langclass/LM/tt.lm \ + langclass/LM/ty.lm \ + langclass/LM/tzm-Latn.lm \ + langclass/LM/ug.lm \ + langclass/LM/uk.lm \ + langclass/LM/ur.lm \ + langclass/LM/uz-Cyrl.lm \ + langclass/LM/uz.lm \ + langclass/LM/ve.lm \ + langclass/LM/vep.lm \ + langclass/LM/vi.lm \ + langclass/LM/wa.lm \ + langclass/LM/xh.lm \ + langclass/LM/yi.lm \ + langclass/LM/yo.lm \ + langclass/LM/zh-Hans.lm \ + langclass/LM/zh-Hant.lm \ + langclass/LM/zu.lm \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libexttextcat/ExternalProject_libexttextcat.mk b/external/libexttextcat/ExternalProject_libexttextcat.mk new file mode 100644 index 000000000..1d729a103 --- /dev/null +++ b/external/libexttextcat/ExternalProject_libexttextcat.mk @@ -0,0 +1,30 @@ +# -*- 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,libexttextcat)) + +$(eval $(call gb_ExternalProject_register_targets,libexttextcat,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,libexttextcat,build): + $(call gb_Trace_StartRange,libexttextcat,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure --disable-shared --with-pic \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(ENABLE_WERROR),--enable-werror,--disable-werror) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_DEBUGINFO_FLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ + $(if $(COM_IS_CLANG),-Qunused-arguments) \ + $(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libexttextcat,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libexttextcat/Makefile b/external/libexttextcat/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libexttextcat/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/libexttextcat/Module_libexttextcat.mk b/external/libexttextcat/Module_libexttextcat.mk new file mode 100644 index 000000000..00f73f619 --- /dev/null +++ b/external/libexttextcat/Module_libexttextcat.mk @@ -0,0 +1,26 @@ +# -*- 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,libexttextcat)) + +$(eval $(call gb_Module_add_targets,libexttextcat,\ + ExternalPackage_fingerprint \ + UnpackedTarball_libexttextcat \ +)) +ifeq ($(COM),MSC) +$(eval $(call gb_Module_add_targets,libexttextcat,\ + StaticLibrary_libexttextcat \ +)) +else +$(eval $(call gb_Module_add_targets,libexttextcat,\ + ExternalProject_libexttextcat \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libexttextcat/README b/external/libexttextcat/README new file mode 100644 index 000000000..6204e987e --- /dev/null +++ b/external/libexttextcat/README @@ -0,0 +1,6 @@ +N-Gram-Based Text Categorization library + +This guesses the language that input text is written in. Fundamentally +an adaptation of wiseguys libtextcat extended to be UTF-8 aware. + +It is hosted at: [https://wiki.documentfoundation.org/Libexttextcat] diff --git a/external/libexttextcat/StaticLibrary_libexttextcat.mk b/external/libexttextcat/StaticLibrary_libexttextcat.mk new file mode 100644 index 000000000..1e70f8501 --- /dev/null +++ b/external/libexttextcat/StaticLibrary_libexttextcat.mk @@ -0,0 +1,25 @@ +# -*- 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_StaticLibrary_StaticLibrary,libexttextcat)) + +$(eval $(call gb_StaticLibrary_use_unpacked,libexttextcat,libexttextcat)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,libexttextcat)) + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,libexttextcat,\ + UnpackedTarball/libexttextcat/src/common \ + UnpackedTarball/libexttextcat/src/fingerprint \ + UnpackedTarball/libexttextcat/src/textcat \ + UnpackedTarball/libexttextcat/src/wg_mempool \ + UnpackedTarball/libexttextcat/src/utf8misc \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/external/libexttextcat/UnpackedTarball_libexttextcat.mk b/external/libexttextcat/UnpackedTarball_libexttextcat.mk new file mode 100644 index 000000000..9262d425b --- /dev/null +++ b/external/libexttextcat/UnpackedTarball_libexttextcat.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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libexttextcat)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libexttextcat,$(LIBEXTTEXTCAT_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libexttextcat)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libffi/ExternalProject_libffi.mk b/external/libffi/ExternalProject_libffi.mk new file mode 100644 index 000000000..13a4b18db --- /dev/null +++ b/external/libffi/ExternalProject_libffi.mk @@ -0,0 +1,35 @@ +# -*- 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,libffi)) + +$(eval $(call gb_ExternalProject_register_targets,libffi,\ + build \ +)) + +# set prefix so that it ends up in libffi.pc so that pkg-config in python3 works + +$(call gb_ExternalProject_get_state_target,libffi,build): + $(call gb_Trace_StartRange,libffi,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure \ + --enable-option-checking=fatal \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + --enable-static \ + --disable-shared \ + --with-pic \ + --enable-portable-binary \ + CC="$(CC) $(if $(filter LINUX,$(OS)),-fvisibility=hidden)" \ + --prefix=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM) \ + --disable-docs \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libffi,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libffi/Makefile b/external/libffi/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libffi/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/libffi/Module_libffi.mk b/external/libffi/Module_libffi.mk new file mode 100644 index 000000000..739fd4197 --- /dev/null +++ b/external/libffi/Module_libffi.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,libffi)) + +$(eval $(call gb_Module_add_targets,libffi,\ + UnpackedTarball_libffi \ + ExternalProject_libffi \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libffi/README b/external/libffi/README new file mode 100644 index 000000000..cdf7fa937 --- /dev/null +++ b/external/libffi/README @@ -0,0 +1,3 @@ +libffi is required to build CPython's ctypes module + +https://sourceware.org/libffi/ diff --git a/external/libffi/UnpackedTarball_libffi.mk b/external/libffi/UnpackedTarball_libffi.mk new file mode 100644 index 000000000..5d0582329 --- /dev/null +++ b/external/libffi/UnpackedTarball_libffi.mk @@ -0,0 +1,14 @@ +# -*- 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,libffi)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libffi,$(LIBFFI_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk new file mode 100644 index 000000000..be3a47848 --- /dev/null +++ b/external/libfreehand/ExternalProject_libfreehand.mk @@ -0,0 +1,48 @@ +# -*- 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) ./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) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(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 000000000..e4968cf85 --- /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 000000000..b00efd16e --- /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 000000000..7403eb1a0 --- /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 000000000..641b470e3 --- /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 000000000..20b0af801 --- /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); diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk new file mode 100644 index 000000000..3afd218ee --- /dev/null +++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk @@ -0,0 +1,28 @@ +# -*- 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_ExternalPackage_ExternalPackage,libgpg-error,libgpg-error)) + +$(eval $(call gb_ExternalPackage_use_external_project,libgpg-error,libgpg-error)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) + +ifeq ($(OS),LINUX) + +$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.22.0)) + +else ifeq ($(OS),MACOSX) + +$(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.0.dylib,src/.libs/libgpg-error.0.dylib)) + +endif + +endif # $(DISABLE_DYNLOADING) + +# vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk new file mode 100644 index 000000000..cf0b594dc --- /dev/null +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -0,0 +1,54 @@ +# -*- 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,libgpg-error)) + +$(eval $(call gb_ExternalProject_register_targets,libgpg-error,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_autoconf,libgpg-error,build)) + +ifeq ($(COM),MSC) +gb_ExternalProject_libgpg-error_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) +gb_ExternalProject_libgpg-error_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64) +$(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Executable_get_target,cpp) + $(call gb_Trace_StartRange,libgpg-error,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + MAKE=$(MAKE) ./configure \ + --enable-static \ + --disable-shared \ + --disable-rpath \ + --disable-languages \ + --disable-doc \ + --disable-tests \ + --host=$(gb_ExternalProject_libgpg-error_host) \ + RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libgpg-error,EXTERNAL) +else +$(call gb_ExternalProject_get_state_target,libgpg-error,build): + $(call gb_Trace_StartRange,libgpg-error,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + MAKE=$(MAKE) ./configure \ + --disable-rpath \ + --disable-languages \ + --disable-doc \ + CPPFLAGS=" $(SOLARINC)" \ + $(if $(filter MSC,$(COM)),--force_use_syscfg=true) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libgpg-error,EXTERNAL) + +endif +# vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/Makefile b/external/libgpg-error/Makefile new file mode 100644 index 000000000..569ad8a0b --- /dev/null +++ b/external/libgpg-error/Makefile @@ -0,0 +1,14 @@ +# -*- 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/. +# + +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/libgpg-error/Module_libgpg-error.mk b/external/libgpg-error/Module_libgpg-error.mk new file mode 100644 index 000000000..0079dcba9 --- /dev/null +++ b/external/libgpg-error/Module_libgpg-error.mk @@ -0,0 +1,18 @@ +# -*- 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,libgpg-error)) + +$(eval $(call gb_Module_add_targets,libgpg-error,\ + ExternalProject_libgpg-error \ + ExternalPackage_libgpg-error \ + UnpackedTarball_libgpg-error \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/README b/external/libgpg-error/README new file mode 100644 index 000000000..84288267a --- /dev/null +++ b/external/libgpg-error/README @@ -0,0 +1,2 @@ +A small library that defines common error values for GnuPG components +[https://www.gnupg.org/related_software/libgpg-error/index.html] diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk new file mode 100644 index 000000000..485dc7374 --- /dev/null +++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk @@ -0,0 +1,29 @@ +# -*- 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,libgpg-error)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libgpg-error,$(LIBGPGERROR_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libgpg-error,0)) + +# clang-cl.patch src/gpgrt-int.h part upstream at <https://dev.gnupg.org/T4356> "Declaration of +# _gpgrt_functions_w32_pollable in src/gpgrt-int.h should be extern" +$(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \ + external/libgpg-error/libgpg-error_gawk5.patch \ + $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \ + $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \ + $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-3.patch.1) \ + $(if $(filter MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \ + external/libgpg-error/w32-build-fixes-4.patch \ + external/libgpg-error/clang-cl.patch \ + $(if $(filter LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/clang-cl.patch b/external/libgpg-error/clang-cl.patch new file mode 100644 index 000000000..ef1447fb6 --- /dev/null +++ b/external/libgpg-error/clang-cl.patch @@ -0,0 +1,22 @@ +--- src/gpg-error.h.in ++++ src/gpg-error.h.in +@@ -141,7 +141,7 @@ + + + /* GCC feature test. */ +-#if __GNUC__ ++#if defined __GNUC__ + # define _GPG_ERR_GCC_VERSION (__GNUC__ * 10000 \ + + __GNUC_MINOR__ * 100 \ + + __GNUC_PATCHLEVEL__) +--- src/gpgrt-int.h ++++ src/gpgrt-int.h +@@ -359,7 +359,7 @@ + + #if _WIN32 + /* Prototypes for w32-estream.c. */ +-struct cookie_io_functions_s _gpgrt_functions_w32_pollable; ++extern struct cookie_io_functions_s _gpgrt_functions_w32_pollable; + int _gpgrt_w32_pollable_create (void *_GPGRT__RESTRICT *_GPGRT__RESTRICT cookie, + unsigned int modeflags, + struct cookie_io_functions_s next_functions, diff --git a/external/libgpg-error/libgpg-error_gawk5.patch b/external/libgpg-error/libgpg-error_gawk5.patch new file mode 100644 index 000000000..3be76a453 --- /dev/null +++ b/external/libgpg-error/libgpg-error_gawk5.patch @@ -0,0 +1,114 @@ +--- src/Makefile.am ++++ src/Makefile.am~ +@@ -266,7 +266,7 @@ + + errnos-sym.h: Makefile mkstrtable.awk errnos.in + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ +- -v prefix=GPG_ERR_ -v namespace=errnos_ \ ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ + $(srcdir)/errnos.in >$@ + + +--- src/mkerrcodes.awk ++++ src/mkerrcodes.awk~ +@@ -81,7 +81,7 @@ + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- src/mkerrcodes1.awk ++++ src/mkerrcodes1.awk~ +@@ -81,7 +81,7 @@ + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- src/mkerrcodes2.awk ++++ src/mkerrcodes2.awk~ +@@ -91,7 +91,7 @@ + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- src/mkerrnos.awk ++++ src/mkerrnos.awk~ +@@ -83,7 +83,7 @@ + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- src/mkstrtable.awk ++++ src/mkstrtable.awk~ +@@ -77,7 +77,7 @@ + # + # The variable prefix can be used to prepend a string to each message. + # +-# The variable namespace can be used to prepend a string to each ++# The variable pkg_namespace can be used to prepend a string to each + # variable and macro name. + + BEGIN { +@@ -102,7 +102,7 @@ + print "/* The purpose of this complex string table is to produce"; + print " optimal code with a minimum of relocations. */"; + print ""; +- print "static const char " namespace "msgstr[] = "; ++ print "static const char " pkg_namespace "msgstr[] = "; + header = 0; + } + else +@@ -110,7 +110,7 @@ + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +@@ -150,7 +150,7 @@ + else + print " gettext_noop (\"" last_msgstr "\");"; + print ""; +- print "static const int " namespace "msgidx[] ="; ++ print "static const int " pkg_namespace "msgidx[] ="; + print " {"; + for (i = 0; i < coded_msgs; i++) + print " " pos[i] ","; +@@ -158,7 +158,7 @@ + print " };"; + print ""; + print "static GPG_ERR_INLINE int"; +- print namespace "msgidxof (int code)"; ++ print pkg_namespace "msgidxof (int code)"; + print "{"; + print " return (0 ? 0"; + +--- src/Makefile.in ++++ src/Makefile.in~ +@@ -1321,7 +1321,7 @@ + + errnos-sym.h: Makefile mkstrtable.awk errnos.in + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ +- -v prefix=GPG_ERR_ -v namespace=errnos_ \ ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ + $(srcdir)/errnos.in >$@ + + mkheader: mkheader.c Makefile + diff --git a/external/libgpg-error/libgpgerror-bundled-soname.patch.1 b/external/libgpg-error/libgpgerror-bundled-soname.patch.1 new file mode 100644 index 000000000..4f927def3 --- /dev/null +++ b/external/libgpg-error/libgpgerror-bundled-soname.patch.1 @@ -0,0 +1,22 @@ +--- libgpg-error/src/Makefile.in.orig 2019-01-28 14:11:10.518425440 +0100 ++++ libgpg-error/src/Makefile.in 2019-01-28 14:11:16.901414229 +0100 +@@ -540,7 +540,7 @@ + @HAVE_LD_VERSION_SCRIPT_TRUE@libgpg_error_vers_opt = -Wl,--version-script=$(srcdir)/gpg-error.vers + libgpg_error_la_LDFLAGS = \ + $(no_undefined) $(export_symbols) $(libgpg_error_vers_opt) \ +- $(extra_ltoptions) -version-info \ ++ $(extra_ltoptions) -release lo -version-info \ + @LIBGPG_ERROR_LT_CURRENT@:@LIBGPG_ERROR_LT_REVISION@:@LIBGPG_ERROR_LT_AGE@ + + libgpg_error_la_SOURCES = gettext.h $(arch_sources) \ +--- libgpg-error/src/gpg-error.vers.orig 2019-01-28 14:08:11.413740011 +0100 ++++ libgpg-error/src/gpg-error.vers 2019-01-28 14:08:34.172700037 +0100 +@@ -20,7 +20,7 @@ + # visibility.h and gpg-error.def.in as well. + + +-GPG_ERROR_1.0 { ++GPG_ERROR_LIBREOFFICE { + global: + gpg_strerror; + gpg_strerror_r; diff --git a/external/libgpg-error/w32-build-fixes-2.patch.1 b/external/libgpg-error/w32-build-fixes-2.patch.1 new file mode 100644 index 000000000..3d9c4324a --- /dev/null +++ b/external/libgpg-error/w32-build-fixes-2.patch.1 @@ -0,0 +1,31 @@ +diff -ru libgpg-error.orig/src/Makefile.in libgpg-error/src/Makefile.in +--- libgpg-error.orig/src/Makefile.in 2017-09-12 08:18:29.376536700 +0200 ++++ libgpg-error/src/Makefile.in 2017-09-12 08:57:11.648083800 +0200 +@@ -512,8 +512,7 @@ + @HAVE_W32_SYSTEM_TRUE@arch_sources = w32-gettext.c w32-lock.c w32-lock-obj.h w32-thread.c \ + @HAVE_W32_SYSTEM_TRUE@ w32-iconv.c w32-estream.c + +-@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +-@HAVE_W32_SYSTEM_TRUE@ -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS) ++@HAVE_W32_SYSTEM_TRUE@RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) -DLOCALEDIR=$(localedir) $(AM_CPPFLAGS) + + @HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE) + @HAVE_W32_SYSTEM_TRUE@SUFFIXES = .rc .lo +@@ -1242,7 +1241,7 @@ + + + @HAVE_W32_SYSTEM_TRUE@.rc.lo: +-@HAVE_W32_SYSTEM_TRUE@ $(LTRCCOMPILE) -i "$<" -o "$@" ++@HAVE_W32_SYSTEM_TRUE@ $(LTRCCOMPILE) -i $< -o $@ + + @HAVE_W32_SYSTEM_TRUE@versioninfo.lo : gpg-error.w32-manifest + +@@ -1283,7 +1282,7 @@ + # It is correct to use $(CPP). We want the host's idea of the error codes. + mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers) + $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@ +- $(CPP) $(CPPFLAGS) $(extra_cppflags) -P _$@ | grep GPG_ERR_ | \ ++ $(CPP) $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \ + $(AWK) -f $(srcdir)/mkerrcodes.awk >$@ + -rm _$@ + diff --git a/external/libgpg-error/w32-build-fixes-3.patch.1 b/external/libgpg-error/w32-build-fixes-3.patch.1 new file mode 100644 index 000000000..5883211f9 --- /dev/null +++ b/external/libgpg-error/w32-build-fixes-3.patch.1 @@ -0,0 +1,57 @@ +diff -ru libgpg-error.orig/src/gpg-error.c libgpg-error/src/gpg-error.c +--- libgpg-error.orig/src/gpg-error.c 2016-12-02 22:55:32.000000000 +0100 ++++ libgpg-error/src/gpg-error.c 2017-09-13 22:25:10.040113800 +0200 +@@ -206,7 +206,7 @@ + static const char src_prefix[] = "GPG_ERR_SOURCE_"; + static const char code_prefix[] = "GPG_ERR_"; + +- if (!strncasecmp (src_prefix, str, sizeof (src_prefix) - 1)) ++ if (!_strnicmp (src_prefix, str, sizeof (src_prefix) - 1)) + { + gpg_err_source_t src; + +@@ -220,14 +220,14 @@ + const char *src_sym; + + src_sym = gpg_strsource_sym (src << GPG_ERR_SOURCE_SHIFT); +- if (src_sym && !strcasecmp (str, src_sym + sizeof (src_prefix) - 1)) ++ if (src_sym && !_stricmp (str, src_sym + sizeof (src_prefix) - 1)) + { + *err |= src << GPG_ERR_SOURCE_SHIFT; + return 1; + } + } + } +- else if (!strncasecmp (code_prefix, str, sizeof (code_prefix) - 1)) ++ else if (!_strnicmp (code_prefix, str, sizeof (code_prefix) - 1)) + { + gpg_err_code_t code; + +@@ -240,7 +240,7 @@ + { + const char *code_sym = gpg_strerror_sym (code); + if (code_sym +- && !strcasecmp (str, code_sym + sizeof (code_prefix) - 1)) ++ && !_stricmp (str, code_sym + sizeof (code_prefix) - 1)) + { + *err |= code; + return 1; +@@ -296,7 +296,7 @@ + for (src = 0; src < GPG_ERR_SOURCE_DIM; src++) + { + const char *src_str = gpg_strsource (src << GPG_ERR_SOURCE_SHIFT); +- if (src_str && !strcasecmp (str, src_str)) ++ if (src_str && !_stricmp (str, src_str)) + { + if (*have_source) + return 0; +@@ -310,7 +310,7 @@ + for (code = 0; code < GPG_ERR_CODE_DIM; code++) + { + const char *code_str = gpg_strerror (code); +- if (code_str && !strcasecmp (str, code_str)) ++ if (code_str && !_stricmp (str, code_str)) + { + if (*have_code) + return 0; +Nur in libgpg-error/src: gpg-error.c~. diff --git a/external/libgpg-error/w32-build-fixes-4.patch b/external/libgpg-error/w32-build-fixes-4.patch new file mode 100644 index 000000000..1d4e052a5 --- /dev/null +++ b/external/libgpg-error/w32-build-fixes-4.patch @@ -0,0 +1,13 @@ +Avoid MFC dependency - can go with very basic includes instead + +--- src/versioninfo.rc.in~ 2017-02-28 14:48:38.000000000 +0100 ++++ src/versioninfo.rc.in 2017-11-29 01:41:47.549804600 +0100 +@@ -14,8 +14,6 @@ + + #line __LINE__ "versioninfo.rc.in" + +-#include <afxres.h> +- + + VS_VERSION_INFO VERSIONINFO + FILEVERSION @BUILD_FILEVERSION@ diff --git a/external/libgpg-error/w32-build-fixes.patch b/external/libgpg-error/w32-build-fixes.patch new file mode 100644 index 000000000..96a62e320 --- /dev/null +++ b/external/libgpg-error/w32-build-fixes.patch @@ -0,0 +1,206 @@ +diff -ur libgpg-error.org/src/estream.c libgpg-error/src/estream.c +--- src/estream.c 2016-11-16 13:22:03.000000000 +0100 ++++ src/estream.c~ 2017-02-19 17:53:15.010869000 +0100 +@@ -74,12 +74,16 @@ + # include <sys/time.h> + #endif + #include <sys/types.h> +-#include <sys/file.h> ++/*#include <sys/file.h>*/ + #include <sys/stat.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <unistd.h> ++#ifdef _WIN32 ++# include <io.h> ++#else ++# include <unistd.h> ++#endif + #include <stdarg.h> + #include <fcntl.h> + #include <errno.h> +@@ -109,6 +113,15 @@ + + + #ifdef HAVE_W32_SYSTEM ++# ifndef S_IRUSR ++# define S_IRUSR _S_IREAD ++# endif ++# ifndef S_IWUSR ++# define S_IWUSR _S_IWRITE ++# endif ++# ifndef S_IXUSR ++# define S_IXUSR 0x00400000 ++# endif + # ifndef S_IRGRP + # define S_IRGRP S_IRUSR + # endif +diff -ur libgpg-error.org/src/estream-printf.c libgpg-error/src/estream-printf.c +--- src/estream-printf.c 2016-12-02 22:51:19.000000000 +0100 ++++ src/estream-printf.c~ 2017-02-19 18:02:52.239383500 +0100 +@@ -85,7 +85,11 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <unistd.h> ++#ifdef _WIN32 ++# include <io.h> ++#else ++# include <unistd.h> ++#endif + #include <stdarg.h> + #include <errno.h> + #include <stddef.h> +--- src/Makefile.am 2017-02-28 13:33:38.000000000 +0100 ++++ src/Makefile.am~ 2017-09-10 21:52:19.739988146 +0200 +@@ -99,9 +99,9 @@ + + CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ + gpg-error.h gpgrt.h \ +- mkerrcodes mkerrcodes.h gpg-error.def mkw32errmap.tab.h \ ++ mkerrcodes.exe mkerrcodes.h gpg-error.def mkw32errmap.tab.h \ + mkw32errmap.map.c err-sources-sym.h err-codes-sym.h errnos-sym.h \ +- gpg-extra/errno.h mkheader $(tmp_files) lock-obj-pub.native.h ++ gpg-extra/errno.h mkheader.exe $(tmp_files) lock-obj-pub.native.h + + + # +@@ -251,7 +251,7 @@ + + # It is correct to use $(CC_FOR_BUILD) here. We want to run the + # program at build time. +-mkerrcodes: mkerrcodes.c mkerrcodes.h Makefile ++mkerrcodes.exe: mkerrcodes.c mkerrcodes.h Makefile + $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c + + if HAVE_W32CE_SYSTEM +@@ -261,7 +261,7 @@ + $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c + endif + +-code-from-errno.h: mkerrcodes Makefile ++code-from-errno.h: mkerrcodes.exe Makefile + ./mkerrcodes | $(AWK) -f $(srcdir)/mkerrcodes2.awk >$@ + + errnos-sym.h: Makefile mkstrtable.awk errnos.in +@@ -270,7 +270,7 @@ + $(srcdir)/errnos.in >$@ + + +-mkheader: mkheader.c Makefile ++mkheader.exe: mkheader.c Makefile + $(CC_FOR_BUILD) -g -O0 -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + + parts_of_gpg_error_h = \ +@@ -297,7 +297,7 @@ + + # We also depend on versioninfo.rc because that is build by + # config.status and thus has up-to-date version numbers. +-gpg-error.h: Makefile mkheader $(parts_of_gpg_error_h) \ ++gpg-error.h: Makefile mkheader.exe $(parts_of_gpg_error_h) \ + versioninfo.rc ../config.h + $(pre_mkheader_cmds) + ./mkheader $(host_os) $(host_triplet) $(srcdir)/gpg-error.h.in \ +diff -ru libgpg-error.orig/src/Makefile.in libgpg-error/src/Makefile.in +--- src/Makefile.in 2017-02-28 15:03:41.000000000 +0100 ++++ src/Makefile.in~ 2017-09-10 21:53:48.447987149 +0200 +@@ -493,9 +493,9 @@ + tmp_files = _mkerrcodes.h _gpg-error.def.h mkw32errmap.tab.h mkw32errmap.map.c + CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ + gpg-error.h gpgrt.h \ +- mkerrcodes mkerrcodes.h gpg-error.def mkw32errmap.tab.h \ ++ mkerrcodes.exe mkerrcodes.h gpg-error.def mkw32errmap.tab.h \ + mkw32errmap.map.c err-sources-sym.h err-codes-sym.h errnos-sym.h \ +- gpg-extra/errno.h mkheader $(tmp_files) lock-obj-pub.native.h ++ gpg-extra/errno.h mkheader.exe $(tmp_files) lock-obj-pub.native.h + + + # +@@ -1309,7 +1309,7 @@ + + # It is correct to use $(CC_FOR_BUILD) here. We want to run the + # program at build time. +-mkerrcodes: mkerrcodes.c mkerrcodes.h Makefile ++mkerrcodes.exe: mkerrcodes.c mkerrcodes.h Makefile + $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c + + # It is correct to use $(CC_FOR_BUILD) here. We want to run the +@@ -1317,7 +1317,7 @@ + @HAVE_W32CE_SYSTEM_TRUE@mkw32errmap: mkw32errmap.c mkw32errmap.tab.h Makefile + @HAVE_W32CE_SYSTEM_TRUE@ $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c + +-code-from-errno.h: mkerrcodes Makefile ++code-from-errno.h: mkerrcodes.exe Makefile + ./mkerrcodes | $(AWK) -f $(srcdir)/mkerrcodes2.awk >$@ + + errnos-sym.h: Makefile mkstrtable.awk errnos.in +@@ -1325,7 +1325,7 @@ + -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ + $(srcdir)/errnos.in >$@ + +-mkheader: mkheader.c Makefile ++mkheader.exe: mkheader.c Makefile + $(CC_FOR_BUILD) -g -O0 -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + + @FORCE_USE_SYSCFG_FALSE@./lock-obj-pub.native.h: Makefile gen-posix-lock-obj$(EXEEXT) posix-lock-obj.h +@@ -1333,7 +1333,7 @@ + + # We also depend on versioninfo.rc because that is build by + # config.status and thus has up-to-date version numbers. +-gpg-error.h: Makefile mkheader $(parts_of_gpg_error_h) \ ++gpg-error.h: Makefile mkheader.exe $(parts_of_gpg_error_h) \ + versioninfo.rc ../config.h + $(pre_mkheader_cmds) + ./mkheader $(host_os) $(host_triplet) $(srcdir)/gpg-error.h.in \ +--- src/mkheader.c 2016-11-16 13:22:03.000000000 +0100 ++++ src/mkheader.c~ 2017-02-19 17:35:32.172009000 +0100 +@@ -16,7 +16,11 @@ + #include <stdlib.h> + #include <string.h> + #include <errno.h> +-#include <unistd.h> ++#ifdef _WIN32 ++# include <io.h> ++#else ++# include <unistd.h> ++#endif + + #define PGM "mkheader" + +@@ -402,12 +406,20 @@ + + repl_flag = !!strchr (name, '&'); + incfname = mk_include_name (name, repl_flag? host_triplet : NULL); ++#ifdef _WIN32 ++ rc = _access (incfname, 04); ++#else + rc = access (incfname, R_OK); ++#endif + if (rc && repl_flag) + { + free (incfname); + incfname = mk_include_name (name, host_os); ++#ifdef _WIN32 ++ rc = _access (incfname, 04); ++#else + rc = access (incfname, R_OK); ++#endif + } + if (!rc) + include_file (fname, lnr, name, outf); +diff -ur libgpg-error.org/src/w32-estream.c libgpg-error/src/w32-estream.c +--- src/w32-estream.c 2016-11-16 13:22:03.000000000 +0100 ++++ src/w32-estream.c~ 2017-02-19 17:37:35.879037500 +0100 +@@ -42,6 +42,11 @@ + + #include "gpgrt-int.h" + ++#ifdef _WIN32 ++/* no ssize_t in windows std headers, emulate for native build */ ++typedef SSIZE_T ssize_t; ++#endif ++ + /* + * In order to support es_poll on Windows, we create a proxy shim that + * we use as the estream I/O functions. This shim creates reader and diff --git a/external/libgpg-error/w32-disable-dllinit.patch.1 b/external/libgpg-error/w32-disable-dllinit.patch.1 new file mode 100644 index 000000000..96abb3bbd --- /dev/null +++ b/external/libgpg-error/w32-disable-dllinit.patch.1 @@ -0,0 +1,55 @@ +Disable all DLL init functions in libgpg-error, since they're +not actually run in statically linked libs. And libtool seems +to unconditionally set that flag on all Windows builds. + +diff -ur libgpg-error.org/src/init.c libgpg-error/src/init.c +--- libgpg-error.org/src/init.c 2017-02-28 10:11:05.000000000 +0100 ++++ libgpg-error/src/init.c 2017-11-23 16:44:56.850797400 +0100 +@@ -88,7 +88,7 @@ + _gpg_err_init (void) + { + #ifdef HAVE_W32_SYSTEM +-# ifdef DLL_EXPORT ++# ifdef HAVE_DLL_INIT + /* We always have a constructor and thus this function is called + automatically. Due to the way the C init code of mingw works, + the constructors are called before our DllMain function is +@@ -130,7 +130,7 @@ + void + _gpg_err_deinit (int mode) + { +-#if defined (HAVE_W32_SYSTEM) && !defined(DLL_EXPORT) ++#if defined (HAVE_W32_SYSTEM) && !defined(HAVE_DLL_INIT) + struct tls_space_s *tls; + + tls = TlsGetValue (tls_index); +@@ -473,7 +473,7 @@ + + + /* Entry point called by the DLL loader. */ +-#ifdef DLL_EXPORT ++#ifdef HAVE_DLL_INIT + int WINAPI + DllMain (HINSTANCE hinst, DWORD reason, LPVOID reserved) + { +diff -ur libgpg-error.org/src/w32-gettext.c libgpg-error/src/w32-gettext.c +--- libgpg-error.org/src/w32-gettext.c 2016-12-02 22:51:19.000000000 +0100 ++++ libgpg-error/src/w32-gettext.c 2017-11-23 16:43:28.450453000 +0100 +@@ -1180,7 +1180,7 @@ + DLL. If used as a static lib we can't control the process set; for + example it might be used with a main module which is not build with + mingw and thus does not know how to call the constructors. */ +-#ifdef DLL_EXPORT ++#ifdef HAVE_DLL_INIT + static void module_init (void) _GPG_ERR_CONSTRUCTOR; + #endif + static void +@@ -1195,7 +1195,7 @@ + } + } + +-#if !defined(DLL_EXPORT) || !defined(_GPG_ERR_HAVE_CONSTRUCTOR) ++#if !defined(HAVE_DLL_INIT) || !defined(_GPG_ERR_HAVE_CONSTRUCTOR) + void + _gpg_w32__init_gettext_module (void) + { diff --git a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk new file mode 100644 index 000000000..a6c8f0d77 --- /dev/null +++ b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk @@ -0,0 +1,43 @@ +# -*- 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,libjpeg-turbo)) + +$(eval $(call gb_ExternalProject_use_autoconf,libjpeg-turbo,configure)) +$(eval $(call gb_ExternalProject_use_autoconf,libjpeg-turbo,build)) + +$(eval $(call gb_ExternalProject_register_targets,libjpeg-turbo,\ + configure \ + build \ +)) + +$(call gb_ExternalProject_get_state_target,libjpeg-turbo,build) : $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) + $(call gb_Trace_StartRange,libjpeg-turbo,EXTERNAL) + +$(call gb_ExternalProject_run,build,\ + $(MAKE) \ + ) + $(call gb_Trace_EndRange,libjpeg-turbo,EXTERNAL) + +$(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) : + $(call gb_Trace_StartRange,libjpeg-turbo,EXTERNAL) + $(call gb_ExternalProject_run,configure,\ + MAKE=$(MAKE) ./configure \ + --build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \ + --host=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(HOST_PLATFORM)) \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-java \ + --without-turbojpeg \ + $(if $(NASM),,--without-simd) \ + CFLAGS='$(if $(debug),$(gb_DEBUGINFO_FLAGS)) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(CFLAGS) $(gb_VISIBILITY_FLAGS)' \ + ) + $(call gb_Trace_EndRange,libjpeg-turbo,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libjpeg-turbo/Makefile b/external/libjpeg-turbo/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libjpeg-turbo/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/libjpeg-turbo/Module_libjpeg-turbo.mk b/external/libjpeg-turbo/Module_libjpeg-turbo.mk new file mode 100644 index 000000000..137e7557b --- /dev/null +++ b/external/libjpeg-turbo/Module_libjpeg-turbo.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,libjpeg-turbo)) + +$(eval $(call gb_Module_add_targets,libjpeg-turbo,\ + ExternalProject_libjpeg-turbo \ + UnpackedTarball_libjpeg-turbo \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libjpeg-turbo/README b/external/libjpeg-turbo/README new file mode 100644 index 000000000..46eff7cb7 --- /dev/null +++ b/external/libjpeg-turbo/README @@ -0,0 +1,6 @@ +External library for reading/writing jpegs + +This is only used by the jpeg import filter that is provided +for use by VCL see [[vcl/source/filter/jpeg]] + +From [http://www.libjpeg-turbo.org/]. diff --git a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk new file mode 100644 index 000000000..a99df67bb --- /dev/null +++ b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.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,libjpeg-turbo)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libjpeg-turbo,$(LIBJPEG_TURBO_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libjpeg-turbo)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libjpeg-turbo,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,libjpeg-turbo,\ + external/libjpeg-turbo/jpeg-turbo.build.patch.1 \ + $(if $(filter WNT,$(OS)),external/libjpeg-turbo/jpeg-turbo.win_build.patch.1) \ + external/libjpeg-turbo/ubsan.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libjpeg-turbo/jpeg-turbo.build.patch.1 b/external/libjpeg-turbo/jpeg-turbo.build.patch.1 new file mode 100644 index 000000000..4d01ad4b9 --- /dev/null +++ b/external/libjpeg-turbo/jpeg-turbo.build.patch.1 @@ -0,0 +1,58 @@ +diff -ur jpeg.org/Makefile.am jpeg/Makefile.am +--- jpeg.org/Makefile.am 2014-11-14 12:05:43.349386578 +0100 ++++ jpeg/Makefile.am 2014-11-14 12:06:21.005387021 +0100 +@@ -174,8 +174,6 @@ + rm -rf `find $(distdir) -name .svn` + + +-SUBDIRS += md5 +- + if WITH_12BIT + + TESTORIG = testorig12.jpg +diff -ru jpeg-turbo.orig/Makefile.in jpeg-turbo/Makefile.in +--- jpeg-turbo.orig/Makefile.in 2015-09-21 20:48:45.000000000 +0200 ++++ jpeg-turbo/Makefile.in 2015-11-22 16:17:10.326527000 +0100 +@@ -405,7 +405,7 @@ + ETAGS = etags + CTAGS = ctags + CSCOPE = cscope +-DIST_SUBDIRS = java simd md5 ++DIST_SUBDIRS = java simd + am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(srcdir)/jconfig.h.in \ + $(srcdir)/jconfigint.h.in $(srcdir)/libjpeg.map.in \ +@@ -622,7 +622,7 @@ + jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \ + jquant2.c jutils.c jmemmgr.c jmemnobs.c $(am__append_4) \ + $(am__append_5) $(am__append_6) $(am__append_11) +-SUBDIRS = java $(am__append_10) md5 ++SUBDIRS = java $(am__append_10) + @WITH_TURBOJPEG_TRUE@libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) \ + @WITH_TURBOJPEG_TRUE@ turbojpeg.c turbojpeg.h transupp.c \ + @WITH_TURBOJPEG_TRUE@ transupp.h jdatadst-tj.c jdatasrc-tj.c \ +diff -ru jpeg-turbo.orig/configure jpeg-turbo/configure +--- jpeg-turbo.orig/configure 2015-09-21 20:48:41.000000000 +0200 ++++ jpeg-turbo/configure 2015-11-22 15:23:25.387071000 +0100 +@@ -14630,9 +14630,7 @@ + $as_echo "yes" >&6; } + else + rm -rf conftest* +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + fi + + +@@ -14828,9 +14826,7 @@ + $as_echo "yes" >&6; } + else + rm -rf conftest* +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- as_fn_error $? "configuration problem: maybe object file format mismatch." "$LINENO" 5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + fi + + diff --git a/external/libjpeg-turbo/jpeg-turbo.win_build.patch.1 b/external/libjpeg-turbo/jpeg-turbo.win_build.patch.1 new file mode 100644 index 000000000..00b642703 --- /dev/null +++ b/external/libjpeg-turbo/jpeg-turbo.win_build.patch.1 @@ -0,0 +1,54 @@ +Copy definitions of "boolean", "INT16", "INT32" from win/jconfig.h.in + +... into jconfig.h.in, which is the one we use via configure. + +diff -ru jpeg-turbo.orig/simd/Makefile.in jpeg-turbo/simd/Makefile.in +--- jpeg-turbo.orig/simd/Makefile.in 2015-09-21 20:48:45.000000000 +0200 ++++ jpeg-turbo/simd/Makefile.in 2015-11-22 10:52:46.975285184 +0100 +@@ -769,8 +769,8 @@ + .asm.lo: + $(AM_V_GEN) $(LIBTOOL) $(AM_V_lt) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(AM_V_lt) $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@ + +-jsimdcfg.inc: $(srcdir)/jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h +- $(AM_V_GEN) $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@ ++jsimdcfg.inc: $(top_srcdir)/win/jsimdcfg.inc ++ cp $< $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -ru jpeg-turbo.orig/configure jpeg-turbo/configure +--- jpeg-turbo.orig/configure 2015-11-22 15:57:23.702656000 +0100 ++++ jpeg-turbo/configure 2015-11-22 15:59:37.084285000 +0100 +@@ -13931,7 +13931,7 @@ + + else + +-$as_echo "#define NEED_BSD_STRINGS 1" >>confdefs.h ++$as_echo "#undef NEED_BSD_STRINGS" >>confdefs.h + + fi + done +--- jpeg-turbo/jconfig.h.in.orig 2016-11-02 22:43:55.012600000 +0100 ++++ jpeg-turbo/jconfig.h.in 2016-11-02 22:45:01.905400000 +0100 +@@ -71,3 +71,21 @@ + + /* Define to `unsigned int' if <sys/types.h> does not define. */ + #undef size_t ++ ++#ifdef _MSC_VER ++ ++/* Define "boolean" as unsigned char, not int, per Windows custom */ ++#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ ++typedef unsigned char boolean; ++#endif ++#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ ++ ++/* Define "INT32" as int, not long, per Windows custom */ ++#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */ ++typedef short INT16; ++typedef signed int INT32; ++#endif ++#define XMD_H /* prevent jmorecfg.h from redefining it */ ++ ++#endif /* _MSC_VER */ ++ diff --git a/external/libjpeg-turbo/ubsan.patch b/external/libjpeg-turbo/ubsan.patch new file mode 100644 index 000000000..33d3c15a8 --- /dev/null +++ b/external/libjpeg-turbo/ubsan.patch @@ -0,0 +1,39 @@ +--- jcphuff.c ++++ jcphuff.c +@@ -14,6 +14,7 @@ + * suspension. + */ + ++#include <stdint.h> + #define JPEG_INTERNALS + #include "jinclude.h" + #include "jpeglib.h" +@@ -255,7 +256,7 @@ + if (c == 0xFF) { /* need to stuff a zero byte? */ + emit_byte(entropy, 0); + } +- put_buffer <<= 8; ++ put_buffer = (uint_least32_t) put_buffer << 8; + put_bits -= 8; + } + +--- jdarith.c ++++ jdarith.c +@@ -306,7 +306,7 @@ + while (m >>= 1) + if (arith_decode(cinfo, st)) v |= m; + v += 1; if (sign) v = -v; +- entropy->last_dc_val[ci] += v; ++ entropy->last_dc_val[ci] = (entropy->last_dc_val[ci] + v) & 0xffff; + } + + /* Scale and output the DC coefficient (assumes jpeg_natural_order[0]=0) */ +@@ -564,7 +564,7 @@ + while (m >>= 1) + if (arith_decode(cinfo, st)) v |= m; + v += 1; if (sign) v = -v; +- entropy->last_dc_val[ci] += v; ++ entropy->last_dc_val[ci] = (entropy->last_dc_val[ci] + v) & 0xffff; + } + + if (block) diff --git a/external/liblangtag/ExternalPackage_liblangtag.mk b/external/liblangtag/ExternalPackage_liblangtag.mk new file mode 100644 index 000000000..549f5eb36 --- /dev/null +++ b/external/liblangtag/ExternalPackage_liblangtag.mk @@ -0,0 +1,20 @@ +# -*- 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_ExternalPackage_ExternalPackage,liblangtag,liblangtag)) + +$(eval $(call gb_ExternalPackage_use_external_project,liblangtag,liblangtag)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag.1.dylib,liblangtag/.libs/liblangtag.1.dylib)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.1,liblangtag/.libs/liblangtag-lo.so.1.4.1)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/ExternalPackage_liblangtag_data.mk b/external/liblangtag/ExternalPackage_liblangtag_data.mk new file mode 100644 index 000000000..fee94a1b5 --- /dev/null +++ b/external/liblangtag/ExternalPackage_liblangtag_data.mk @@ -0,0 +1,37 @@ +# -*- 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_ExternalPackage_ExternalPackage,liblangtag_data,liblangtag)) + +$(eval $(call gb_ExternalPackage_use_external_project,liblangtag_data,liblangtag)) + +$(eval $(call gb_ExternalPackage_add_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\ + data/language-subtag-registry.xml \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag/common/bcp47,\ + data/common/bcp47/calendar.xml \ + data/common/bcp47/collation.xml \ + data/common/bcp47/currency.xml \ + data/common/bcp47/number.xml \ + data/common/bcp47/timezone.xml \ + data/common/bcp47/transform.xml \ + data/common/bcp47/transform_ime.xml \ + data/common/bcp47/transform_keyboard.xml \ + data/common/bcp47/transform_mt.xml \ + data/common/bcp47/transform_private_use.xml \ + data/common/bcp47/variant.xml \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag/common/supplemental,\ + data/common/supplemental/likelySubtags.xml \ + data/common/supplemental/supplementalMetadata.xml \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/liblangtag/ExternalProject_liblangtag.mk b/external/liblangtag/ExternalProject_liblangtag.mk new file mode 100644 index 000000000..060c6f360 --- /dev/null +++ b/external/liblangtag/ExternalProject_liblangtag.mk @@ -0,0 +1,55 @@ +# -*- 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,liblangtag)) + +$(eval $(call gb_ExternalProject_use_external,liblangtag,libxml2)) + +$(eval $(call gb_ExternalProject_use_autoconf,liblangtag,build)) + +$(eval $(call gb_ExternalProject_register_targets,liblangtag,\ + build \ +)) + +# disable ccache on windows, as it doesn't cope with the quoted defines +# liblangtag uses (-DBUILDDIR="\"$(abs_top_builddir)\"" and similar). +# Results in "cl : Command line error D8003 : missing source filename" +$(call gb_ExternalProject_get_state_target,liblangtag,build): + $(call gb_Trace_StartRange,liblangtrag,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + MAKE=$(MAKE) ./configure --disable-modules --disable-test --disable-introspection --with-pic \ + $(if $(or $(DISABLE_DYNLOADING),$(filter MSC,$(COM))), \ + --disable-shared --enable-static, \ + --enable-shared --disable-static) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \ + CFLAGS='$(CFLAGS) \ + $(if $(ENABLE_OPTIMIZED), \ + $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ + $(if $(call gb_Module__symbols_enabled,liblangtag),$(gb_DEBUGINFO_FLAGS))' \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \ + LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ + LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \ + $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN) \ + $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN) \ + && $(if $(filter WNT,$(OS)),\ + REAL_CC="$(shell cygpath -w $(lastword $(filter-out -%,$(CC))))" \ + REAL_CC_FLAGS="$(filter -%,$(CC))") \ + $(if $(verbose),V=1) \ + $(MAKE) \ + LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,liblangtag)/liblangtag/.libs)))' \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl URELIB \ + $(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,liblangtrag,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/Makefile b/external/liblangtag/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/liblangtag/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/liblangtag/Module_liblangtag.mk b/external/liblangtag/Module_liblangtag.mk new file mode 100644 index 000000000..dbb7dd5f1 --- /dev/null +++ b/external/liblangtag/Module_liblangtag.mk @@ -0,0 +1,25 @@ +# -*- 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,liblangtag)) + +$(eval $(call gb_Module_add_targets,liblangtag,\ + UnpackedTarball_liblangtag \ + ExternalPackage_liblangtag_data \ + ExternalProject_liblangtag \ +)) + + +ifneq ($(COM),MSC) +$(eval $(call gb_Module_add_targets,liblangtag,\ + ExternalPackage_liblangtag \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/README b/external/liblangtag/README new file mode 100644 index 000000000..254e40a22 --- /dev/null +++ b/external/liblangtag/README @@ -0,0 +1,10 @@ +From [https://bitbucket.org/tagoh/liblangtag]. An interface for BCP47 language tags. + +Updated IANA Language Subtag Registry files are available as +[https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry] +and per convention are stored as a data/language-subtag-registry file in a +language-subtag-registry-YYYY-MM-DD.tar.bz2 archive, with YYYY-MM-DD being the +File-Date entry of the file, for example +language-subtag-registry-2015-08-04.tar.bz2, and uploaded to the external +sources repository to be included in the build of liblangtag. See download.lst +LANGTAGREG_TARBALL and LANGTAGREG_SHA256SUM. diff --git a/external/liblangtag/UnpackedTarball_liblangtag.mk b/external/liblangtag/UnpackedTarball_liblangtag.mk new file mode 100644 index 000000000..aae5a56e3 --- /dev/null +++ b/external/liblangtag/UnpackedTarball_liblangtag.mk @@ -0,0 +1,40 @@ +# -*- 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,liblangtag)) + +$(eval $(call gb_UnpackedTarball_set_tarball,liblangtag,$(LIBLANGTAG_TARBALL),,liblangtag)) + +$(eval $(call gb_UnpackedTarball_set_pre_action,liblangtag,\ + $(GNUTAR) -x -j -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \ +)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,liblangtag)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,liblangtag,0)) + +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,liblangtag,\ + external/liblangtag/liblangtag-bundled-soname.patch.0 \ +)) +endif +endif + +# * external/liblangtag/Wformat-overflow.patch is effectively covered by upstream +# <https://bitbucket.org/tagoh/liblangtag/commits/49135ef561f309078f0bfd6e1f15052769cf75b4> "Fix +# possible null argument for %s directive": +$(eval $(call gb_UnpackedTarball_add_patches,liblangtag, \ + $(if $(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \ + external/liblangtag/clang-cl.patch.0 \ + external/liblangtag/langtag-valencia.patch.0 \ + external/liblangtag/Wformat-overflow.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/Wformat-overflow.patch b/external/liblangtag/Wformat-overflow.patch new file mode 100644 index 000000000..f2d017e4b --- /dev/null +++ b/external/liblangtag/Wformat-overflow.patch @@ -0,0 +1,17 @@ +--- liblangtag/lt-script-db.c ++++ liblangtag/lt-script-db.c +@@ -134,8 +134,12 @@ + cnode = cnode->next; + } + if (!subtag) { +- lt_warning("No subtag node: description = '%s'", +- desc); ++ if (!desc) { ++ lt_warning("No subtag nor description node"); ++ } else { ++ lt_warning("No subtag node: description = '%s'", ++ desc); ++ } + goto bail1; + } + if (!desc) { diff --git a/external/liblangtag/clang-cl.patch.0 b/external/liblangtag/clang-cl.patch.0 new file mode 100644 index 000000000..94348b65f --- /dev/null +++ b/external/liblangtag/clang-cl.patch.0 @@ -0,0 +1,41 @@ +--- liblangtag/lt-macros.h ++++ liblangtag/lt-macros.h +@@ -120,7 +120,7 @@ + * + * See the GNU C documentation for more details. + */ +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) ++#if (defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))) || defined __clang__ + # define LT_GNUC_PRINTF(format_idx, arg_idx) \ + __attribute__((__format__ (__printf__, format_idx, arg_idx))) + # define LT_GNUC_UNUSED \ +@@ -136,7 +136,7 @@ + * explicit %NULL. + * See the GNU C documentation for details. + */ +-#if __GNUC__ >= 4 ++#if (defined __GNUC__ &&__GNUC__ >= 4) || defined __clang__ + # define LT_GNUC_NULL_TERMINATED \ + __attribute__((__sentinel__)) + #else /* !__GNUC__ */ +@@ -220,17 +220,17 @@ + * + * See the GNU C documentation for more details. + */ +-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) ++#if defined __GNUC__ && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) + #define LT_GNUC_DEPRECATED __attribute__((__deprecated__)) + #else + #define LT_GNUC_DEPRECATED + #endif +-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) ++#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) + #define LT_GNUC_DEPRECATED_FOR(f) __attribute__((deprecated("Use " #f " instead"))) + #else + #define LT_GNUC_DEPRECATED_FOR(f) LT_GNUC_DEPRECATED + #endif +-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) ++#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) + #define LT_GNUC_BEGIN_IGNORE_DEPRECATIONS \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") diff --git a/external/liblangtag/langtag-libtool-rpath.patch.0 b/external/liblangtag/langtag-libtool-rpath.patch.0 new file mode 100644 index 000000000..368832b8b --- /dev/null +++ b/external/liblangtag/langtag-libtool-rpath.patch.0 @@ -0,0 +1,23 @@ +Prevent libtool from adding annoying stuff to RPATH + +--- configure ++++ configure +@@ -10730,6 +10730,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd*) +--- data/Makefile.in ++++ data/Makefile.in +@@ -859,7 +859,7 @@ + @CROSS_COMPILING_TRUE@language-subtag-registry.xml: language-subtag-registry reg2xml.c Makefile + @CROSS_COMPILING_TRUE@ @echo Warning: Unable to rebuild $@ when cross-compiling + @CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@language-subtag-registry.xml: language-subtag-registry reg2xml$(EXEEXT) Makefile +-@CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@ $(AM_V_GEN) $(builddir)/reg2xml$(EXEEXT) $(srcdir)/language-subtag-registry $@.tmp || $(builddir)/reg2xml$(EXEEXT) $(builddir)/language-subtag-registry $@.tmp; \ ++@CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@ $(AM_V_GEN) $(LIBO_TUNNEL_LIBRARY_PATH) $(builddir)/reg2xml$(EXEEXT) $(srcdir)/language-subtag-registry $@.tmp || $(LIBO_TUNNEL_LIBRARY_PATH) $(builddir)/reg2xml$(EXEEXT) $(builddir)/language-subtag-registry $@.tmp; \ + @CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@ head -1 $@.tmp | grep -E '^<\?xml version'>/dev/null 2>&1 && mv $@.tmp $@ || (echo "E: $@ isn't an expected result"; rm $@.tmp) + @CROSS_COMPILING_FALSE@@REBUILD_DATA_FALSE@language-subtag-registry.xml: + @CROSS_COMPILING_FALSE@@REBUILD_DATA_FALSE@ @echo Warning: the rebuild of $@ is explicitly disabled. diff --git a/external/liblangtag/langtag-valencia.patch.0 b/external/liblangtag/langtag-valencia.patch.0 new file mode 100644 index 000000000..dc2804304 --- /dev/null +++ b/external/liblangtag/langtag-valencia.patch.0 @@ -0,0 +1,29 @@ +--- liblangtag/lt-tag.c ++++ liblangtag/lt-tag.c +@@ -2009,11 +2009,23 @@ + if (ctag->region) + lt_string_append_printf(string, "_%s", + lt_region_get_tag(ctag->region)); +- if (ctag->script) { ++ if (ctag->script) + mod = lt_script_convert_to_modifier(ctag->script); +- if (mod) +- lt_string_append_printf(string, "@%s", mod); ++ if (!mod && ctag->variants) ++ { ++ lt_list_t* l; ++ for (l = ctag->variants; l != NULL; l = lt_list_next(l)) { ++ lt_variant_t *variant = lt_list_value(l); ++ const char *s = lt_variant_get_tag(variant); ++ if (lt_strcmp0(s, "valencia") == 0) { ++ mod = "valencia"; ++ break; ++ } ++ } + } ++ if (mod) ++ lt_string_append_printf(string, "@%s", mod); ++ + lt_tag_unref(ctag); + + bail: diff --git a/external/liblangtag/liblangtag-bundled-soname.patch.0 b/external/liblangtag/liblangtag-bundled-soname.patch.0 new file mode 100644 index 000000000..4780d7a12 --- /dev/null +++ b/external/liblangtag/liblangtag-bundled-soname.patch.0 @@ -0,0 +1,10 @@ +--- liblangtag/Makefile.in.orig 2015-08-07 11:57:42.256742305 +0200 ++++ liblangtag/Makefile.in 2015-08-07 11:58:11.818741799 +0200 +@@ -638,6 +638,7 @@ + liblangtag_la_LDFLAGS = \ + $(LDFLAGS) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ++ -release lo \ + $(NULL) + + all: $(BUILT_SOURCES) diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk new file mode 100644 index 000000000..21121f091 --- /dev/null +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -0,0 +1,46 @@ +# -*- 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,libmspub)) + +$(eval $(call gb_ExternalProject_use_autoconf,libmspub,build)) + +$(eval $(call gb_ExternalProject_register_targets,libmspub,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libmspub,\ + boost_headers \ + icu \ + revenge \ + zlib \ +)) + +$(call gb_ExternalProject_get_state_target,libmspub,build) : + $(call gb_Trace_StartRange,libmspub,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-tools \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-werror \ + --disable-weffc \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libmspub,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libmspub/Makefile b/external/libmspub/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libmspub/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/libmspub/Module_libmspub.mk b/external/libmspub/Module_libmspub.mk new file mode 100644 index 000000000..81ea7e91d --- /dev/null +++ b/external/libmspub/Module_libmspub.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,libmspub)) + +$(eval $(call gb_Module_add_targets,libmspub,\ + ExternalProject_libmspub \ + UnpackedTarball_libmspub \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libmspub/README b/external/libmspub/README new file mode 100644 index 000000000..5a6625fff --- /dev/null +++ b/external/libmspub/README @@ -0,0 +1,3 @@ +Library parsing the Microsoft Publisher documents. + +[https://wiki.documentfoundation.org/DLP/Libraries/libmspub] diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk new file mode 100644 index 000000000..287be540d --- /dev/null +++ b/external/libmspub/UnpackedTarball_libmspub.mk @@ -0,0 +1,31 @@ +# -*- 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,libmspub)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,0)) + +# * external/libmspub/stdint.patch is upstream at <https://gerrit.libreoffice.org/#/c/73814/> +# "missing include": +$(eval $(call gb_UnpackedTarball_add_patches,libmspub,\ + external/libmspub/ubsan.patch \ + external/libmspub/stdint.patch \ +)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmspub)) + +ifeq ($(ANDROID_APP_ABI),armeabi-v7a) +$(eval $(call gb_UnpackedTarball_add_patches,libmspub, \ + external/libmspub/libmspub_android_arm.patch.1 \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libmspub/libmspub_android_arm.patch.1 b/external/libmspub/libmspub_android_arm.patch.1 new file mode 100644 index 000000000..2d7d0e12c --- /dev/null +++ b/external/libmspub/libmspub_android_arm.patch.1 @@ -0,0 +1,12 @@ +diff -ur libmspub.org/src/lib/libmspub_utils.cpp libmspub/src/lib/libmspub_utils.cpp +--- libmspub.org/src/lib/libmspub_utils.cpp 2018-04-07 15:13:32.041792236 +0200 ++++ libmspub/src/lib/libmspub_utils.cpp 2018-04-07 15:14:08.547790739 +0200 +@@ -29,7 +29,7 @@ + { + va_list args; + va_start(args, format); +- std::vfprintf(stderr, format, args); ++ vfprintf(stderr, format, args); + va_end(args); + } + diff --git a/external/libmspub/stdint.patch b/external/libmspub/stdint.patch new file mode 100644 index 000000000..61f1dd122 --- /dev/null +++ b/external/libmspub/stdint.patch @@ -0,0 +1,10 @@ +--- src/lib/MSPUBMetaData.h ++++ src/lib/MSPUBMetaData.h +@@ -13,6 +13,7 @@ + #include <map> + #include <utility> + #include <vector> ++#include <stdint.h> + + #include <librevenge/librevenge.h> + diff --git a/external/libmspub/ubsan.patch b/external/libmspub/ubsan.patch new file mode 100644 index 000000000..b58249e18 --- /dev/null +++ b/external/libmspub/ubsan.patch @@ -0,0 +1,12 @@ +--- src/lib/MSPUBContentChunkType.h ++++ src/lib/MSPUBContentChunkType.h +@@ -27,7 +27,8 @@ + CELLS = 0x63, + FONT = 0x6C, + IMAGE_2K, //these don't exist in Pub 2k3 so their value in the enum is not used. +- IMAGE_2K_DATA ++ IMAGE_2K_DATA, ++ MSPUBContentChunkType_dummy=0xFF // MSPUBParser.cpp:2359:9: runtime error: load of value 138, which is not a valid value for type 'libmspub::MSPUBContentChunkType' + }; + } // namespace libmspub + diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk b/external/libmwaw/ExternalPackage_libmwaw.mk new file mode 100644 index 000000000..6f3f27ccc --- /dev/null +++ b/external/libmwaw/ExternalPackage_libmwaw.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,libmwaw,libmwaw)) + +$(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.3.dylib,src/lib/.libs/libmwaw-0.3.3.dylib)) +else ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3-lo.so.3,src/lib/.libs/libmwaw-0.3-lo.so.3.0.$(MWAW_VERSION_MICRO))) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk new file mode 100644 index 000000000..067de6900 --- /dev/null +++ b/external/libmwaw/ExternalProject_libmwaw.mk @@ -0,0 +1,54 @@ +# -*- 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,libmwaw)) + +$(eval $(call gb_ExternalProject_use_autoconf,libmwaw,build)) + +$(eval $(call gb_ExternalProject_register_targets,libmwaw,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libmwaw,\ + revenge \ +)) + +$(call gb_ExternalProject_get_state_target,libmwaw,build) : + $(call gb_Trace_StartRange,libmwaw,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && ./configure \ + --with-pic \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + --without-docs \ + --disable-tools \ + --disable-zip \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + --disable-werror \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && (cd $(EXTERNAL_WORKDIR)/src/lib && \ + $(MAKE)) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/lib/.libs/libmwaw-0.3.3.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,libmwaw,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk new file mode 100644 index 000000000..880a70861 --- /dev/null +++ b/external/libmwaw/Library_mwaw.mk @@ -0,0 +1,206 @@ +# -*- 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_Library_Library,mwaw)) + +$(eval $(call gb_Library_use_unpacked,mwaw,libmwaw)) + +$(eval $(call gb_Library_use_externals,mwaw,\ + revenge \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,mwaw)) + +$(eval $(call gb_Library_set_precompiled_header,mwaw,external/libmwaw/inc/pch/precompiled_mwaw)) + +$(eval $(call gb_Library_set_include,mwaw,\ + -I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,mwaw,\ + -DBUILD_MWAW \ + -DNDEBUG \ + -D_WINDLL \ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ + UnpackedTarball/libmwaw/src/lib/ActaParser \ + UnpackedTarball/libmwaw/src/lib/ActaText \ + UnpackedTarball/libmwaw/src/lib/ApplePictParser \ + UnpackedTarball/libmwaw/src/lib/BeagleWksBMParser \ + UnpackedTarball/libmwaw/src/lib/BeagleWksDBParser \ + UnpackedTarball/libmwaw/src/lib/BeagleWksDRParser \ + UnpackedTarball/libmwaw/src/lib/BeagleWksParser \ + UnpackedTarball/libmwaw/src/lib/BeagleWksSSParser \ + UnpackedTarball/libmwaw/src/lib/BeagleWksStructManager \ + UnpackedTarball/libmwaw/src/lib/BeagleWksText \ + UnpackedTarball/libmwaw/src/lib/ClarisDrawGraph \ + UnpackedTarball/libmwaw/src/lib/ClarisDrawParser \ + UnpackedTarball/libmwaw/src/lib/ClarisDrawStyleManager \ + UnpackedTarball/libmwaw/src/lib/ClarisDrawText \ + UnpackedTarball/libmwaw/src/lib/ClarisWksBMParser \ + UnpackedTarball/libmwaw/src/lib/ClarisWksDatabase \ + UnpackedTarball/libmwaw/src/lib/ClarisWksDbaseContent \ + UnpackedTarball/libmwaw/src/lib/ClarisWksDocument \ + UnpackedTarball/libmwaw/src/lib/ClarisWksGraph \ + UnpackedTarball/libmwaw/src/lib/ClarisWksPRParser \ + UnpackedTarball/libmwaw/src/lib/ClarisWksParser \ + UnpackedTarball/libmwaw/src/lib/ClarisWksPresentation \ + UnpackedTarball/libmwaw/src/lib/ClarisWksSSParser \ + UnpackedTarball/libmwaw/src/lib/ClarisWksSpreadsheet \ + UnpackedTarball/libmwaw/src/lib/ClarisWksStruct \ + UnpackedTarball/libmwaw/src/lib/ClarisWksStyleManager \ + UnpackedTarball/libmwaw/src/lib/ClarisWksTable \ + UnpackedTarball/libmwaw/src/lib/ClarisWksText \ + UnpackedTarball/libmwaw/src/lib/CorelPainterParser \ + UnpackedTarball/libmwaw/src/lib/CricketDrawParser \ + UnpackedTarball/libmwaw/src/lib/DocMkrParser \ + UnpackedTarball/libmwaw/src/lib/DocMkrText \ + UnpackedTarball/libmwaw/src/lib/EDocParser \ + UnpackedTarball/libmwaw/src/lib/FreeHandParser \ + UnpackedTarball/libmwaw/src/lib/FullWrtGraph \ + UnpackedTarball/libmwaw/src/lib/FullWrtParser \ + UnpackedTarball/libmwaw/src/lib/FullWrtStruct \ + UnpackedTarball/libmwaw/src/lib/FullWrtText \ + UnpackedTarball/libmwaw/src/lib/GreatWksBMParser \ + UnpackedTarball/libmwaw/src/lib/GreatWksDBParser \ + UnpackedTarball/libmwaw/src/lib/GreatWksDRParser \ + UnpackedTarball/libmwaw/src/lib/GreatWksDocument \ + UnpackedTarball/libmwaw/src/lib/GreatWksGraph \ + UnpackedTarball/libmwaw/src/lib/GreatWksParser \ + UnpackedTarball/libmwaw/src/lib/GreatWksSSParser \ + UnpackedTarball/libmwaw/src/lib/GreatWksText \ + UnpackedTarball/libmwaw/src/lib/HanMacWrdJGraph \ + UnpackedTarball/libmwaw/src/lib/HanMacWrdJParser \ + UnpackedTarball/libmwaw/src/lib/HanMacWrdJText \ + UnpackedTarball/libmwaw/src/lib/HanMacWrdKGraph \ + UnpackedTarball/libmwaw/src/lib/HanMacWrdKParser \ + UnpackedTarball/libmwaw/src/lib/HanMacWrdKText \ + UnpackedTarball/libmwaw/src/lib/LightWayTxtGraph \ + UnpackedTarball/libmwaw/src/lib/LightWayTxtParser \ + UnpackedTarball/libmwaw/src/lib/LightWayTxtText \ + UnpackedTarball/libmwaw/src/lib/MWAWCell \ + UnpackedTarball/libmwaw/src/lib/MWAWChart \ + UnpackedTarball/libmwaw/src/lib/MWAWDebug \ + UnpackedTarball/libmwaw/src/lib/MWAWDocument \ + UnpackedTarball/libmwaw/src/lib/MWAWEntry \ + UnpackedTarball/libmwaw/src/lib/MWAWFont \ + UnpackedTarball/libmwaw/src/lib/MWAWFontConverter \ + UnpackedTarball/libmwaw/src/lib/MWAWFontSJISConverter \ + UnpackedTarball/libmwaw/src/lib/MWAWGraphicDecoder \ + UnpackedTarball/libmwaw/src/lib/MWAWGraphicEncoder \ + UnpackedTarball/libmwaw/src/lib/MWAWGraphicListener \ + UnpackedTarball/libmwaw/src/lib/MWAWGraphicShape \ + UnpackedTarball/libmwaw/src/lib/MWAWGraphicStyle \ + UnpackedTarball/libmwaw/src/lib/MWAWHeader \ + UnpackedTarball/libmwaw/src/lib/MWAWInputStream \ + UnpackedTarball/libmwaw/src/lib/MWAWList \ + UnpackedTarball/libmwaw/src/lib/MWAWListener \ + UnpackedTarball/libmwaw/src/lib/MWAWOLEParser \ + UnpackedTarball/libmwaw/src/lib/MWAWPageSpan \ + UnpackedTarball/libmwaw/src/lib/MWAWParagraph \ + UnpackedTarball/libmwaw/src/lib/MWAWParser \ + UnpackedTarball/libmwaw/src/lib/MWAWPict \ + UnpackedTarball/libmwaw/src/lib/MWAWPictBitmap \ + UnpackedTarball/libmwaw/src/lib/MWAWPictData \ + UnpackedTarball/libmwaw/src/lib/MWAWPictMac \ + UnpackedTarball/libmwaw/src/lib/MWAWPosition \ + UnpackedTarball/libmwaw/src/lib/MWAWPresentationListener \ + UnpackedTarball/libmwaw/src/lib/MWAWPrinter \ + UnpackedTarball/libmwaw/src/lib/MWAWPropertyHandler \ + UnpackedTarball/libmwaw/src/lib/MWAWRSRCParser \ + UnpackedTarball/libmwaw/src/lib/MWAWSection \ + UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetDecoder \ + UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetEncoder \ + UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetListener \ + UnpackedTarball/libmwaw/src/lib/MWAWStream \ + UnpackedTarball/libmwaw/src/lib/MWAWStringStream \ + UnpackedTarball/libmwaw/src/lib/MWAWSubDocument \ + UnpackedTarball/libmwaw/src/lib/MWAWTable \ + UnpackedTarball/libmwaw/src/lib/MWAWTextListener \ + UnpackedTarball/libmwaw/src/lib/MacDocParser \ + UnpackedTarball/libmwaw/src/lib/MacDraft5Parser \ + UnpackedTarball/libmwaw/src/lib/MacDraft5StyleManager \ + UnpackedTarball/libmwaw/src/lib/MacDraftParser \ + UnpackedTarball/libmwaw/src/lib/MacDrawParser \ + UnpackedTarball/libmwaw/src/lib/MacDrawProParser \ + UnpackedTarball/libmwaw/src/lib/MacDrawProStyleManager \ + UnpackedTarball/libmwaw/src/lib/MacPaintParser \ + UnpackedTarball/libmwaw/src/lib/MacWrtParser \ + UnpackedTarball/libmwaw/src/lib/MacWrtProParser \ + UnpackedTarball/libmwaw/src/lib/MacWrtProStructures \ + UnpackedTarball/libmwaw/src/lib/MaxWrtParser \ + UnpackedTarball/libmwaw/src/lib/MarinerWrtGraph \ + UnpackedTarball/libmwaw/src/lib/MarinerWrtParser \ + UnpackedTarball/libmwaw/src/lib/MarinerWrtText \ + UnpackedTarball/libmwaw/src/lib/MindWrtParser \ + UnpackedTarball/libmwaw/src/lib/MoreParser \ + UnpackedTarball/libmwaw/src/lib/MoreText \ + UnpackedTarball/libmwaw/src/lib/MouseWrtParser \ + UnpackedTarball/libmwaw/src/lib/MsWks3Text \ + UnpackedTarball/libmwaw/src/lib/MsWks4Text \ + UnpackedTarball/libmwaw/src/lib/MsWks4Zone \ + UnpackedTarball/libmwaw/src/lib/MsWksDBParser \ + UnpackedTarball/libmwaw/src/lib/MsWksDRParser \ + UnpackedTarball/libmwaw/src/lib/MsWksDocument \ + UnpackedTarball/libmwaw/src/lib/MsWksGraph \ + UnpackedTarball/libmwaw/src/lib/MsWksParser \ + UnpackedTarball/libmwaw/src/lib/MsWksSSParser \ + UnpackedTarball/libmwaw/src/lib/MsWksTable \ + UnpackedTarball/libmwaw/src/lib/MsWrd1Parser \ + UnpackedTarball/libmwaw/src/lib/MsWrdParser \ + UnpackedTarball/libmwaw/src/lib/MsWrdStruct \ + UnpackedTarball/libmwaw/src/lib/MsWrdText \ + UnpackedTarball/libmwaw/src/lib/MsWrdTextStyles \ + UnpackedTarball/libmwaw/src/lib/MultiplanParser \ + UnpackedTarball/libmwaw/src/lib/NisusWrtGraph \ + UnpackedTarball/libmwaw/src/lib/NisusWrtParser \ + UnpackedTarball/libmwaw/src/lib/NisusWrtStruct \ + UnpackedTarball/libmwaw/src/lib/NisusWrtText \ + UnpackedTarball/libmwaw/src/lib/PixelPaintParser \ + UnpackedTarball/libmwaw/src/lib/PowerPoint1Parser \ + UnpackedTarball/libmwaw/src/lib/PowerPoint3OLE \ + UnpackedTarball/libmwaw/src/lib/PowerPoint3Parser \ + UnpackedTarball/libmwaw/src/lib/PowerPoint7Graph \ + UnpackedTarball/libmwaw/src/lib/PowerPoint7Parser \ + UnpackedTarball/libmwaw/src/lib/PowerPoint7Struct \ + UnpackedTarball/libmwaw/src/lib/PowerPoint7Text \ + UnpackedTarball/libmwaw/src/lib/RagTime5Chart \ + UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \ + UnpackedTarball/libmwaw/src/lib/RagTime5Document \ + UnpackedTarball/libmwaw/src/lib/RagTime5Formula \ + UnpackedTarball/libmwaw/src/lib/RagTime5Graph \ + UnpackedTarball/libmwaw/src/lib/RagTime5Layout \ + UnpackedTarball/libmwaw/src/lib/RagTime5Parser \ + UnpackedTarball/libmwaw/src/lib/RagTime5Pipeline \ + UnpackedTarball/libmwaw/src/lib/RagTime5SSParser \ + UnpackedTarball/libmwaw/src/lib/RagTime5Spreadsheet \ + UnpackedTarball/libmwaw/src/lib/RagTime5StructManager \ + UnpackedTarball/libmwaw/src/lib/RagTime5StyleManager \ + UnpackedTarball/libmwaw/src/lib/RagTime5Text \ + UnpackedTarball/libmwaw/src/lib/RagTimeParser \ + UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \ + UnpackedTarball/libmwaw/src/lib/RagTimeStruct \ + UnpackedTarball/libmwaw/src/lib/RagTimeText \ + UnpackedTarball/libmwaw/src/lib/StyleParser \ + UnpackedTarball/libmwaw/src/lib/SuperPaintParser \ + UnpackedTarball/libmwaw/src/lib/TeachTxtParser \ + UnpackedTarball/libmwaw/src/lib/WingzGraph \ + UnpackedTarball/libmwaw/src/lib/WingzParser \ + UnpackedTarball/libmwaw/src/lib/WriteNowEntry \ + UnpackedTarball/libmwaw/src/lib/WriteNowParser \ + UnpackedTarball/libmwaw/src/lib/WriteNowText \ + UnpackedTarball/libmwaw/src/lib/WriterPlsParser \ + UnpackedTarball/libmwaw/src/lib/ZWrtParser \ + UnpackedTarball/libmwaw/src/lib/ZWrtText \ + UnpackedTarball/libmwaw/src/lib/libmwaw_internal \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libmwaw/Makefile b/external/libmwaw/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libmwaw/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/libmwaw/Module_libmwaw.mk b/external/libmwaw/Module_libmwaw.mk new file mode 100644 index 000000000..272ec01b4 --- /dev/null +++ b/external/libmwaw/Module_libmwaw.mk @@ -0,0 +1,31 @@ +# -*- 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,libmwaw)) + +$(eval $(call gb_Module_add_targets,libmwaw,\ + UnpackedTarball_libmwaw \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,libmwaw,\ + Library_mwaw \ +)) + +else + +$(eval $(call gb_Module_add_targets,libmwaw,\ + ExternalPackage_libmwaw \ + ExternalProject_libmwaw \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libmwaw/README b/external/libmwaw/README new file mode 100644 index 000000000..c10d26bb5 --- /dev/null +++ b/external/libmwaw/README @@ -0,0 +1,3 @@ +Library parsing different document file formats used on old Mac OS. + +https://sourceforge.net/projects/libmwaw/ diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk new file mode 100644 index 000000000..935cbc1eb --- /dev/null +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -0,0 +1,32 @@ +# -*- 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,libmwaw)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmwaw)) + +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ + external/libmwaw/libmwaw-bundled-soname.patch.0 \ +)) +endif +endif + +ifeq ($(SYSTEM_REVENGE),) +$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ + external/libmwaw/rpath.patch \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libmwaw/inc/pch/precompiled_mwaw.cxx b/external/libmwaw/inc/pch/precompiled_mwaw.cxx new file mode 100644 index 000000000..b72c8e728 --- /dev/null +++ b/external/libmwaw/inc/pch/precompiled_mwaw.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_mwaw.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libmwaw/inc/pch/precompiled_mwaw.hxx b/external/libmwaw/inc/pch/precompiled_mwaw.hxx new file mode 100644 index 000000000..939d664dd --- /dev/null +++ b/external/libmwaw/inc/pch/precompiled_mwaw.hxx @@ -0,0 +1,58 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2020-04-25 20:55:00 using: + ./bin/update_pch external/libmwaw mwaw --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/libmwaw/inc/pch/precompiled_mwaw.hxx "make external/libmwaw.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <algorithm> +#include <cctype> +#include <cmath> +#include <cstdarg> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> +#include <ctype.h> +#include <iomanip> +#include <iostream> +#include <limits> +#include <locale.h> +#include <map> +#include <memory> +#include <set> +#include <sstream> +#include <stack> +#include <string.h> +#include <string> +#include <time.h> +#include <utility> +#include <vector> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <libmwaw/libmwaw.hxx> +#include <librevenge-stream/librevenge-stream.h> +#include <librevenge/librevenge.h> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libmwaw/libmwaw-bundled-soname.patch.0 b/external/libmwaw/libmwaw-bundled-soname.patch.0 new file mode 100644 index 000000000..31f5c75cb --- /dev/null +++ b/external/libmwaw/libmwaw-bundled-soname.patch.0 @@ -0,0 +1,14 @@ +--- src/lib/Makefile.in.orig 2015-08-07 14:04:47.646611627 +0200 ++++ src/lib/Makefile.in 2015-08-07 14:25:49.888589996 +0200 +@@ -418,8 +418,8 @@ + AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) \ + $(ZLIB_CFLAGS) $(am__append_1) + libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(ZLIB_LIBS) @LIBMWAW_WIN32_RESOURCE@ +-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = @LIBMWAW_WIN32_RESOURCE@ +-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = @LIBMWAW_WIN32_RESOURCE@ ++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_SOURCES = \ + libmwaw_internal.cxx \ + libmwaw_internal.hxx \ + diff --git a/external/libmwaw/rpath.patch b/external/libmwaw/rpath.patch new file mode 100644 index 000000000..a73d8ae22 --- /dev/null +++ b/external/libmwaw/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -15353,6 +15353,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) diff --git a/external/libnumbertext/ExternalPackage_numbertext.mk b/external/libnumbertext/ExternalPackage_numbertext.mk new file mode 100644 index 000000000..5379d08fc --- /dev/null +++ b/external/libnumbertext/ExternalPackage_numbertext.mk @@ -0,0 +1,61 @@ +# -*- 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_ExternalPackage_ExternalPackage,libnumbertext_numbertext,libnumbertext)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(LIBO_SHARE_FOLDER)/numbertext,\ + data/af.sor \ + data/bg.sor \ + data/ca.sor \ + data/cs.sor \ + data/da.sor \ + data/de.sor \ + data/el.sor \ + data/en.sor \ + data/eo.sor \ + data/es.sor \ + data/et.sor \ + data/fi.sor \ + data/fr.sor \ + data/fr.sor \ + data/gl.sor \ + data/he.sor \ + data/hr.sor \ + data/hu.sor \ + data/hu_Hung.sor \ + data/id.sor \ + data/is.sor \ + data/it.sor \ + data/ja.sor \ + data/ko.sor \ + data/lb.sor \ + data/lt.sor \ + data/lv.sor \ + data/ms.sor \ + data/no.sor \ + data/nl.sor \ + data/pl.sor \ + data/pt.sor \ + data/Roman.sor \ + data/ro.sor \ + data/ru.sor \ + data/sh.sor \ + data/sl.sor \ + data/sq.sor \ + data/sr.sor \ + data/Suzhou.sor \ + data/sv.sor \ + data/th.sor \ + data/tr.sor \ + data/uk.sor \ + data/vi.sor \ + data/zh.sor \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk new file mode 100644 index 000000000..f4dbe5f65 --- /dev/null +++ b/external/libnumbertext/ExternalProject_libnumbertext.mk @@ -0,0 +1,42 @@ +# -*- 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,libnumbertext)) + +$(eval $(call gb_ExternalProject_use_externals,libnumbertext, \ +)) + +$(eval $(call gb_ExternalProject_register_targets,libnumbertext,\ + build \ +)) + +libnumbertext_CXXFLAGS=$(CXXFLAGS) $(CXXFLAGS_CXX11) + +ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS))) +ifneq (,$(gb_ENABLE_DBGUTIL)) +libnumbertext_CPPFLAGS+=-D_GLIBCXX_DEBUG +endif +endif + +$(call gb_ExternalProject_get_state_target,libnumbertext,build): + $(call gb_Trace_StartRange,libnumbertext,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + LIBS="$(gb_STDLIBS) $(LIBS)" \ + $(SHELL) ./configure --disable-shared --with-pic \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(ENABLE_WERROR),--enable-werror,--disable-werror) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ + $(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \ + $(if $(libnumbertext_CPPFLAGS),CPPFLAGS='$(libnumbertext_CPPFLAGS)') \ + CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \ + && cd src && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libnumbertext,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libnumbertext/MSVCNonBMPBug.patch1 b/external/libnumbertext/MSVCNonBMPBug.patch1 new file mode 100644 index 000000000..8ced22165 --- /dev/null +++ b/external/libnumbertext/MSVCNonBMPBug.patch1 @@ -0,0 +1,69 @@ +MSVC's std::codecvt_utf8 has a bug converting non-BMP codepoints like U+10CFA. +Use MultiByteToWideChar/WideCharToMultiByte instead on Windows. + +diff --git a/src/Numbertext.cxx b/src/Numbertext.cxx +index 5f05b48579af..eb83e59f366f 100755 +--- a/src/Numbertext.cxx ++++ b/src/Numbertext.cxx +@@ -7,6 +7,10 @@ + #include <sstream> + #include <fstream> + ++#ifdef _WIN32 ++#include <Windows.h> ++#endif ++ + #include "Numbertext.hxx" + + #ifdef NUMBERTEXT_BOOST +@@ -22,6 +26,14 @@ + + bool readfile(const std::string& filename, std::wstring& result) + { ++#ifdef _WIN32 ++ std::ifstream ifs(filename); ++ if (ifs.fail()) ++ return false; ++ std::stringstream ss; ++ ss << ifs.rdbuf(); ++ result = Numbertext::string2wstring(ss.str()); ++#else + std::wifstream wif(filename); + if (wif.fail()) + return false; +@@ -29,6 +44,7 @@ bool readfile(const std::string& filename, std::wstring& result) + std::wstringstream wss; + wss << wif.rdbuf(); + result = wss.str(); ++#endif + return true; + } + +@@ -99,7 +112,12 @@ + + std::wstring Numbertext::string2wstring(const std::string& s) + { +-#ifndef NUMBERTEXT_BOOST ++#ifdef _WIN32 ++ int nSize = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, nullptr, 0); ++ std::unique_ptr<wchar_t[]> wstr(new wchar_t[nSize]); ++ MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, wstr.get(), nSize); ++ return wstr.get(); ++#elif !defined NUMBERTEXT_BOOST + typedef std::codecvt_utf8<wchar_t> convert_type; + std::wstring_convert<convert_type, wchar_t> converter; + return converter.from_bytes( s ); +@@ -110,7 +128,12 @@ + + std::string Numbertext::wstring2string(const std::wstring& s) + { +-#ifndef NUMBERTEXT_BOOST ++#ifdef _WIN32 ++ int nSize = WideCharToMultiByte(CP_UTF8, 0, s.c_str(), -1, nullptr, 0, nullptr, nullptr); ++ std::unique_ptr<char[]> str(new char[nSize]); ++ WideCharToMultiByte(CP_UTF8, 0, s.c_str(), -1, str.get(), nSize, nullptr, nullptr); ++ return str.get(); ++#elif !defined NUMBERTEXT_BOOST + typedef std::codecvt_utf8<wchar_t> convert_type; + std::wstring_convert<convert_type, wchar_t> converter; + return converter.to_bytes( s ); diff --git a/external/libnumbertext/Makefile b/external/libnumbertext/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libnumbertext/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/libnumbertext/Module_libnumbertext.mk b/external/libnumbertext/Module_libnumbertext.mk new file mode 100644 index 000000000..1bca2233c --- /dev/null +++ b/external/libnumbertext/Module_libnumbertext.mk @@ -0,0 +1,32 @@ +# -*- 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,libnumbertext)) + +$(eval $(call gb_Module_add_targets,libnumbertext,\ + ExternalPackage_numbertext \ + UnpackedTarball_libnumbertext \ +)) +ifeq ($(COM),MSC) +$(eval $(call gb_Module_add_targets,libnumbertext,\ + StaticLibrary_libnumbertext \ +)) +else + +ifeq ($(ENABLE_LIBNUMBERTEXT),TRUE) + +$(eval $(call gb_Module_add_targets,libnumbertext,\ + ExternalProject_libnumbertext \ +)) + +endif + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libnumbertext/README b/external/libnumbertext/README new file mode 100644 index 000000000..922f19df1 --- /dev/null +++ b/external/libnumbertext/README @@ -0,0 +1,3 @@ +Number to Number Name Conversion Library + +It is hosted at: [https://github.com/Numbertext/libnumbertext] diff --git a/external/libnumbertext/StaticLibrary_libnumbertext.mk b/external/libnumbertext/StaticLibrary_libnumbertext.mk new file mode 100644 index 000000000..78b384a55 --- /dev/null +++ b/external/libnumbertext/StaticLibrary_libnumbertext.mk @@ -0,0 +1,22 @@ +# -*- 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_StaticLibrary_StaticLibrary,libnumbertext)) + +$(eval $(call gb_StaticLibrary_use_unpacked,libnumbertext,libnumbertext)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,libnumbertext)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,libnumbertext,\ + UnpackedTarball/libnumbertext/src/Soros \ + UnpackedTarball/libnumbertext/src/Numbertext \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk b/external/libnumbertext/UnpackedTarball_libnumbertext.mk new file mode 100644 index 000000000..d2efd2f85 --- /dev/null +++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk @@ -0,0 +1,22 @@ +# -*- 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,libnumbertext)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libnumbertext,$(LIBNUMBERTEXT_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libnumbertext)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libnumbertext,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \ + external/libnumbertext/MSVCNonBMPBug.patch1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 b/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 new file mode 100644 index 000000000..1fc4e6b9d --- /dev/null +++ b/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 @@ -0,0 +1,58 @@ +From 68e0c8e4c834df57bc9a0e8da72151f69ff5e7a6 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Fri, 12 Aug 2016 12:50:39 +0200 +Subject: [PATCH] tdf#101077 make double->string conversion locale-agnostic + +--- + src/OdsGenerator.cxx | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/src/OdsGenerator.cxx b/src/OdsGenerator.cxx +index 52e135e..8cb7203 100644 +--- a/src/OdsGenerator.cxx ++++ b/src/OdsGenerator.cxx +@@ -26,6 +26,8 @@ + + #include <librevenge/librevenge.h> + ++#include <iomanip> ++#include <locale> + #include <map> + #include <stack> + #include <sstream> +@@ -46,6 +48,19 @@ + #include "OdcGenerator.hxx" + #include "OdfGenerator.hxx" + ++namespace ++{ ++ ++librevenge::RVNGString makePreciseStr(const double value) ++{ ++ std::ostringstream os; ++ os.imbue(std::locale::classic()); ++ os << std::fixed << std::setprecision(8) << value; ++ return os.str().c_str(); ++} ++ ++} ++ + class OdsGeneratorPrivate : public OdfGenerator + { + public: +@@ -968,10 +983,10 @@ void OdsGenerator::openSheetCell(const librevenge::RVNGPropertyList &propList) + // we need the maximum precision here, so we must avoid getStr() when possible + librevenge::RVNGString value; + if (propList["librevenge:value"]->getUnit()==librevenge::RVNG_GENERIC) +- value.sprintf("%.8f", propList["librevenge:value"]->getDouble()); ++ value = makePreciseStr(propList["librevenge:value"]->getDouble()); + else if (propList["librevenge:value"]->getUnit()==librevenge::RVNG_PERCENT) + { +- value.sprintf("%.8f", propList["librevenge:value"]->getDouble()*100.); ++ value = makePreciseStr(propList["librevenge:value"]->getDouble()*100.); + value.append('%'); + } + else +-- +2.7.4 + diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk b/external/libodfgen/ExternalPackage_libodfgen.mk new file mode 100644 index 000000000..f2df2a623 --- /dev/null +++ b/external/libodfgen/ExternalPackage_libodfgen.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,libodfgen,libodfgen)) + +$(eval $(call gb_ExternalPackage_use_external_project,libodfgen,libodfgen)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.1.dylib,src/.libs/libodfgen-0.1.1.dylib)) +else ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.dll,src/.libs/libodfgen-0.1.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1-lo.so.1,src/.libs/libodfgen-0.1-lo.so.1.0.$(ODFGEN_VERSION_MICRO))) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk new file mode 100644 index 000000000..679598542 --- /dev/null +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -0,0 +1,54 @@ +# -*- 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,libodfgen)) + +$(eval $(call gb_ExternalProject_use_autoconf,libodfgen,build)) + +$(eval $(call gb_ExternalProject_register_targets,libodfgen,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libodfgen,\ + revenge \ +)) + +$(call gb_ExternalProject_get_state_target,libodfgen,build) : + $(call gb_Trace_StartRange,libodfgen,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && ./configure \ + --with-pic \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-werror \ + --disable-weffc \ + --without-docs \ + --with-sharedptr=c++11 \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \ + $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/.libs/libodfgen-0.1.1.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,libodfgen,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/Library_odfgen.mk b/external/libodfgen/Library_odfgen.mk new file mode 100644 index 000000000..946fa9081 --- /dev/null +++ b/external/libodfgen/Library_odfgen.mk @@ -0,0 +1,56 @@ +# -*- 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_Library_Library,odfgen)) + +$(eval $(call gb_Library_use_unpacked,odfgen,libodfgen)) + +$(eval $(call gb_Library_use_externals,odfgen,\ + revenge \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,odfgen)) + +$(eval $(call gb_Library_set_include,odfgen,\ + -I$(call gb_UnpackedTarball_get_dir,libodfgen)/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,odfgen,\ + -DDLL_EXPORT \ + -DLIBODFGEN_BUILD \ + -DNDEBUG \ + -DSHAREDPTR_STD \ + -DPACKAGE=\"libodfgen\" \ + -DVERSION=\"0.1.$(ODFGEN_VERSION_MICRO)\" \ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,odfgen,\ + UnpackedTarball/libodfgen/src/DocumentElement \ + UnpackedTarball/libodfgen/src/FillManager \ + UnpackedTarball/libodfgen/src/FilterInternal \ + UnpackedTarball/libodfgen/src/FontStyle \ + UnpackedTarball/libodfgen/src/GraphicFunctions \ + UnpackedTarball/libodfgen/src/GraphicStyle \ + UnpackedTarball/libodfgen/src/InternalHandler \ + UnpackedTarball/libodfgen/src/ListStyle \ + UnpackedTarball/libodfgen/src/OdcGenerator \ + UnpackedTarball/libodfgen/src/OdfGenerator \ + UnpackedTarball/libodfgen/src/OdgGenerator \ + UnpackedTarball/libodfgen/src/OdpGenerator \ + UnpackedTarball/libodfgen/src/OdsGenerator \ + UnpackedTarball/libodfgen/src/OdtGenerator \ + UnpackedTarball/libodfgen/src/PageSpan \ + UnpackedTarball/libodfgen/src/SectionStyle \ + UnpackedTarball/libodfgen/src/SheetStyle \ + UnpackedTarball/libodfgen/src/TableStyle \ + UnpackedTarball/libodfgen/src/TextRunStyle \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/Makefile b/external/libodfgen/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libodfgen/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/libodfgen/Module_libodfgen.mk b/external/libodfgen/Module_libodfgen.mk new file mode 100644 index 000000000..c10727402 --- /dev/null +++ b/external/libodfgen/Module_libodfgen.mk @@ -0,0 +1,31 @@ +# -*- 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,libodfgen)) + +$(eval $(call gb_Module_add_targets,libodfgen,\ + UnpackedTarball_libodfgen \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,libodfgen,\ + Library_odfgen \ +)) + +else + +$(eval $(call gb_Module_add_targets,libodfgen,\ + ExternalPackage_libodfgen \ + ExternalProject_libodfgen \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/README b/external/libodfgen/README new file mode 100644 index 000000000..01454e0d9 --- /dev/null +++ b/external/libodfgen/README @@ -0,0 +1 @@ +From [https://sourceforge.net/p/libwpd/wiki/libodfgen/]. Library to generate ODT and ODG documents from librevenge API calls. diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk new file mode 100644 index 000000000..c4ea2939f --- /dev/null +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -0,0 +1,40 @@ +# -*- 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,libodfgen)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libodfgen)) + +ifeq ($(SYSTEM_REVENGE),) +$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ + external/libodfgen/rpath.patch \ +)) +endif + +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ + external/libodfgen/libodfgen-bundled-soname.patch.0 \ +)) +endif +endif + +# * external/libodfgen/c++11.patch: obsoleted upstream by +# <https://sourceforge.net/p/libwpd/libodfgen/ci/e11112e50562de4f3252227bfba175ededf82194/> +# "boost::shared_ptr -> std::shared_ptr" +$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ + external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 \ + external/libodfgen/c++11.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/c++11.patch b/external/libodfgen/c++11.patch new file mode 100644 index 000000000..f41d1a166 --- /dev/null +++ b/external/libodfgen/c++11.patch @@ -0,0 +1,44 @@ +# Add -std=c++11 before existing CXXFLAGS, in case those already contain some -std= (which will thus +# override the preceding -std=c++11, which is likely what the caller passing in those CXXFLAGS +# intends): +# +#--- configure.ac +#+++ configure.ac +#@@ -217,7 +217,7 @@ +# AS_IF([test "x$with_sharedptr" = "xc++11"], [ +# AC_MSG_CHECKING([for c++11 shared ptr]) +# save_CXXFLAGS="$CXXFLAGS" +#- CXXFLAGS="$CXXFLAGS -std=c++11" +#+ CXXFLAGS="-std=c++11 $CXXFLAGS" +# AC_COMPILE_IFELSE([ +# AC_LANG_PROGRAM( +# [[#include <memory>]], +#@@ -241,7 +241,7 @@ +# AC_MSG_RESULT([no]) +# ], [ +# AC_MSG_RESULT([yes]) +#- CXXFLAGS="$CXXFLAGS -std=c++11" +#+ CXXFLAGS="-std=c++11 $CXXFLAGS" +# ]) +# ]) +# AS_IF([test "x$with_sharedptr" = "xtr1"], [ +--- configure ++++ configure +@@ -16723,7 +16723,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++11 shared ptr" >&5 + $as_echo_n "checking for c++11 shared ptr... " >&6; } + save_CXXFLAGS="$CXXFLAGS" +- CXXFLAGS="$CXXFLAGS -std=c++11" ++ CXXFLAGS="-std=c++11 $CXXFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16780,7 +16780,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- CXXFLAGS="$CXXFLAGS -std=c++11" ++ CXXFLAGS="-std=c++11 $CXXFLAGS" + + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext diff --git a/external/libodfgen/libodfgen-bundled-soname.patch.0 b/external/libodfgen/libodfgen-bundled-soname.patch.0 new file mode 100644 index 000000000..052ba795e --- /dev/null +++ b/external/libodfgen/libodfgen-bundled-soname.patch.0 @@ -0,0 +1,12 @@ +diff -urN src/Makefile.in.orig src/Makefile.in +--- src/Makefile.in.orig 2016-03-02 17:17:02.812606210 +0100 ++++ src/Makefile.in 2016-03-02 17:17:25.176670151 +0100 +@@ -355,7 +355,7 @@ + AM_CXXFLAGS = -I$(top_srcdir)/inc/ $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBODFGEN_BUILD + libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LIBADD = @LIBODFGEN_WIN32_RESOURCE@ $(REVENGE_LIBS) + libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_DEPENDENCIES = @LIBODFGEN_WIN32_RESOURCE@ +-libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_SOURCES = \ + DocumentElement.cxx \ + DocumentElement.hxx \ diff --git a/external/libodfgen/rpath.patch b/external/libodfgen/rpath.patch new file mode 100644 index 000000000..698cf5dca --- /dev/null +++ b/external/libodfgen/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -13940,6 +13940,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) diff --git a/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch b/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch new file mode 100644 index 000000000..6adae9ba2 --- /dev/null +++ b/external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch @@ -0,0 +1,50 @@ +From 98d2b3377da71b713a37f9004acff3c02c22ce2b Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida <kohei.yoshida@gmail.com> +Date: Wed, 31 Jan 2018 22:11:25 -0500 +Subject: [PATCH 1/2] Alpha value of 0 means fully transparent. I'm sure 255 + was intended. + +(cherry picked from commit f7953a814d6a43205791b6cc01c528ef5d4b1ce3) +--- + src/liborcus/gnumeric_sheet_context.cpp | 4 ++-- + src/liborcus/odf_styles_context.cpp | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/liborcus/gnumeric_sheet_context.cpp b/src/liborcus/gnumeric_sheet_context.cpp +index 8659cc3..6bd1471 100644 +--- a/src/liborcus/gnumeric_sheet_context.cpp ++++ b/src/liborcus/gnumeric_sheet_context.cpp +@@ -132,7 +132,7 @@ public: + { + spreadsheet::color_elem_t red, green, blue; + gnumeric_helper::parse_RGB_color_attribute(red, green, blue, attr.value); +- m_styles.set_fill_fg_color(0, red, green, blue); ++ m_styles.set_fill_fg_color(255, red, green, blue); + + m_fill = true; + +@@ -145,7 +145,7 @@ public: + { + spreadsheet::color_elem_t red, green, blue; + gnumeric_helper::parse_RGB_color_attribute(red, green, blue, attr.value); +- m_styles.set_fill_bg_color(0, red, green, blue); ++ m_styles.set_fill_bg_color(255, red, green, blue); + + m_fill = true; + } +diff --git a/src/liborcus/odf_styles_context.cpp b/src/liborcus/odf_styles_context.cpp +index d988f7d..f9c422a 100644 +--- a/src/liborcus/odf_styles_context.cpp ++++ b/src/liborcus/odf_styles_context.cpp +@@ -739,7 +739,7 @@ void styles_context::start_element(xmlns_id_t ns, xml_token_t name, const std::v + { + spreadsheet::color_elem_t red, green, blue; + func.get_background_color(red, green, blue); +- mp_styles->set_fill_bg_color(0, red, green, blue); ++ mp_styles->set_fill_bg_color(255, red, green, blue); + } + + size_t fill_id = mp_styles->commit_fill(); +-- +2.7.4 + diff --git a/external/liborcus/0001-add-xml-path.patch b/external/liborcus/0001-add-xml-path.patch new file mode 100644 index 000000000..3f9a16bb8 --- /dev/null +++ b/external/liborcus/0001-add-xml-path.patch @@ -0,0 +1,119 @@ +diff --git a/include/orcus/xml_structure_tree.hpp b/include/orcus/xml_structure_tree.hpp +index 58cabfd116fa24e35ff27cf8d7512b6e73df33f4..c88808d24bd74c175fa4017328d3e54b4c588c5e 100644 +--- a/include/orcus/xml_structure_tree.hpp ++++ b/include/orcus/xml_structure_tree.hpp +@@ -127,6 +127,20 @@ public: + size_t get_xmlns_index(xmlns_id_t ns) const; + + std::string get_xmlns_short_name(xmlns_id_t ns) const; ++ ++ /** ++ * Get a XPath like ID for the element inside of the XML tree. ++ * ++ */ ++ std::string get_path() const; ++ ++ /** ++ * Select an element by a path expression. The path expression may be ++ * generated by <code>xml_structure_tree::walker::get_path</code>. ++ * ++ * @param path a simple XPath like expression ++ */ ++ element select_by_path(const std::string& path); + }; + + xml_structure_tree(xmlns_context& xmlns_cxt); +diff --git a/src/liborcus/xml_structure_tree.cpp b/src/liborcus/xml_structure_tree.cpp +index 2778bc05f32841a9441bf471913872e119256895..6622bc57cd2595f12bba80d4bbdb5c24cd6e7bc6 100644 +--- a/src/liborcus/xml_structure_tree.cpp ++++ b/src/liborcus/xml_structure_tree.cpp +@@ -12,6 +12,7 @@ + #include "orcus/exception.hpp" + + #include "orcus/string_pool.hpp" ++#include "string_helper.hpp" + + #include <iostream> + #include <sstream> +@@ -275,6 +276,15 @@ struct xml_structure_tree_impl + { + delete mp_root; + } ++ ++ std::string get_element_str(const xml_structure_tree::entity_name& name) const ++ { ++ ostringstream ss; ++ if (m_xmlns_cxt.get_index(name.ns) != index_not_found) ++ ss << m_xmlns_cxt.get_short_name(name.ns) << ":"; ++ ss << name.name; ++ return ss.str(); ++ } + }; + + struct xml_structure_tree::walker_impl +@@ -423,6 +433,66 @@ string xml_structure_tree::walker::get_xmlns_short_name(xmlns_id_t ns) const + return mp_impl->m_parent_impl.m_xmlns_cxt.get_short_name(ns); + } + ++string xml_structure_tree::walker::get_path() const ++{ ++ ostringstream ss; ++ for (auto& element : mp_impl->m_scopes) ++ { ++ ss << "/" << mp_impl->m_parent_impl.get_element_str(element.name); ++ } ++ ++ return ss.str(); ++} ++ ++xml_structure_tree::element xml_structure_tree::walker::select_by_path(const std::string& path) ++{ ++ pstring p(path); ++ std::vector<pstring> parts = string_helper::split_string(p, '/'); ++ if (parts.empty()) ++ throw general_error("invalid format for path"); ++ ++ // string_helper::split_string will create an empty first element due to leading '/' ++ if (parts[0] != "") ++ { ++ throw general_error("invalid format for path"); ++ } ++ else ++ { ++ parts.erase(parts.begin()); ++ } ++ ++ if (parts.empty()) ++ throw general_error("invalid format for path"); ++ ++ element_ref root_ref(mp_impl->mp_root->name, &mp_impl->mp_root->prop); ++ if (pstring(mp_impl->m_parent_impl.get_element_str(root_ref.name)) != parts[0]) ++ throw general_error("path does not match any element"); ++ ++ std::vector<element_ref> scopes; ++ scopes.push_back(root_ref); ++ ++ for (size_t i = 1; i < parts.size(); ++i) ++ { ++ const elem_prop& prop = *scopes.back().prop; ++ bool found = false; ++ for (auto& child : prop.child_elements) ++ { ++ if (pstring(mp_impl->m_parent_impl.get_element_str(child.first)) == parts[i]) ++ { ++ scopes.emplace_back(child.first, child.second); ++ found = true; ++ break; ++ } ++ } ++ if (!found) ++ throw general_error("path does not match any element"); ++ } ++ ++ std::swap(mp_impl->m_scopes, scopes); ++ const element_ref& ref = mp_impl->m_scopes.back(); ++ return element(ref.name, ref.prop->repeat); ++} ++ + xml_structure_tree::xml_structure_tree(xmlns_context& xmlns_cxt) : + mp_impl(new xml_structure_tree_impl(xmlns_cxt)) {} diff --git a/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch b/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch new file mode 100644 index 000000000..308e51c9b --- /dev/null +++ b/external/liborcus/0001-workaround-a-linking-problem-on-windows.patch @@ -0,0 +1,45 @@ +From 71841b7aa7c5e75a793cfaafb31865524a74d9fc Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Thu, 4 Jun 2015 16:13:18 +0200 +Subject: [PATCH] workaround a linking problem on windows + +Linking scfiltlo.dll gives the following error: + +xmlcontext.o : error LNK2019: unresolved external symbol "char const * const orcus::XMLNS_UNKNOWN_ID" (?XMLNS_UNKNOWN_ID@orcus@@3QBDB) referenced in function "void __cdecl std::_For_each<unsigned int const *,class `anonymous namespace'::SetNamespaceAlias>(unsigned int const *,unsigned int const *,class `anonymous namespace'::SetNamespaceAlias &)" (??$_For_each@PBIVSetNamespaceAlias@?A0xafb5dd33@@@std@@YAXPBI0AAVSetNamespaceAlias@?A0xafb5dd33@@@Z) +C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit_master/Gerrit/Gerrit/Platform/Windows/instdir/program/scfiltlo.dll : fatal error LNK1120: 1 unresolved externals + +I have got no idea what is the cause of this: the constant--exported in +liborcus-parser.dll--is used in liborus.dll without any problem. +--- + include/orcus/types.hpp | 2 +- + src/parser/types.cpp | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/include/orcus/types.hpp b/include/orcus/types.hpp +index b6e3f83..8027f25 100644 +--- a/include/orcus/types.hpp ++++ b/include/orcus/types.hpp +@@ -21,7 +21,7 @@ namespace orcus { + typedef size_t xml_token_t; + typedef const char* xmlns_id_t; + +-ORCUS_PSR_DLLPUBLIC extern const xmlns_id_t XMLNS_UNKNOWN_ID; ++const xmlns_id_t XMLNS_UNKNOWN_ID = nullptr; + ORCUS_PSR_DLLPUBLIC extern const xml_token_t XML_UNKNOWN_TOKEN; + ORCUS_PSR_DLLPUBLIC extern const size_t index_not_found; + ORCUS_PSR_DLLPUBLIC extern const size_t unspecified; +diff --git a/src/parser/types.cpp b/src/parser/types.cpp +index be4e304..0a1b4a7 100644 +--- a/src/parser/types.cpp ++++ b/src/parser/types.cpp +@@ -12,7 +12,6 @@ + + namespace orcus { + +-const xmlns_id_t XMLNS_UNKNOWN_ID = nullptr; + const xml_token_t XML_UNKNOWN_TOKEN = 0; + + const size_t index_not_found = std::numeric_limits<size_t>::max(); +-- +2.4.1 + diff --git a/external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch b/external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch new file mode 100644 index 000000000..15a554a79 --- /dev/null +++ b/external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch @@ -0,0 +1,81 @@ +From 66bbbd42f5d135b7e7dd57eaa7fdf6fd69c664df Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida <kohei.yoshida@gmail.com> +Date: Tue, 13 Feb 2018 22:15:49 -0500 +Subject: [PATCH] xls-xml: Import hidden row and column flags. + +(cherry picked from commit 95420c1a1e8c082bb5953b2a49f0d56eef0e5f7e) +--- + src/liborcus/xls_xml_context.cpp | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp +index 917ff86..04b863a 100644 +--- a/src/liborcus/xls_xml_context.cpp ++++ b/src/liborcus/xls_xml_context.cpp +@@ -1222,6 +1222,7 @@ void xls_xml_context::start_element_column(const xml_token_pair_t& parent, const + spreadsheet::col_t col_index = m_cur_prop_col; + spreadsheet::col_t span = 0; + double width = 0.0; ++ bool hidden = false; + + std::for_each(attrs.begin(), attrs.end(), + [&](const xml_token_attr_t& attr) +@@ -1244,6 +1245,8 @@ void xls_xml_context::start_element_column(const xml_token_pair_t& parent, const + case XML_Span: + span = to_long(attr.value); + break; ++ case XML_Hidden: ++ hidden = to_long(attr.value) != 0; + default: + ; + } +@@ -1251,8 +1254,11 @@ void xls_xml_context::start_element_column(const xml_token_pair_t& parent, const + ); + + for (; span >= 0; --span, ++col_index) ++ { + // Column widths are stored as points. + mp_sheet_props->set_column_width(col_index, width, orcus::length_unit_t::point); ++ mp_sheet_props->set_column_hidden(col_index, hidden); ++ } + + m_cur_prop_col = col_index; + } +@@ -1263,6 +1269,7 @@ void xls_xml_context::start_element_row(const xml_token_pair_t& parent, const xm + m_cur_col = 0; + spreadsheet::row_t row_index = -1; + bool has_height = false; ++ bool hidden = false; + double height = 0.0; + + for (const xml_token_attr_t& attr : attrs) +@@ -1281,6 +1288,9 @@ void xls_xml_context::start_element_row(const xml_token_pair_t& parent, const xm + has_height = true; + height = to_double(attr.value); + break; ++ case XML_Hidden: ++ hidden = to_long(attr.value) != 0; ++ break; + default: + ; + } +@@ -1293,8 +1303,14 @@ void xls_xml_context::start_element_row(const xml_token_pair_t& parent, const xm + m_cur_row = row_index - 1; + } + +- if (mp_sheet_props && has_height) +- mp_sheet_props->set_row_height(m_cur_row, height, length_unit_t::point); ++ if (mp_sheet_props) ++ { ++ if (has_height) ++ mp_sheet_props->set_row_height(m_cur_row, height, length_unit_t::point); ++ ++ if (hidden) ++ mp_sheet_props->set_row_hidden(m_cur_row, true); ++ } + } + + void xls_xml_context::end_element_borders() +-- +2.7.4 + diff --git a/external/liborcus/0001-xls-xml-Pick-up-border-colors.patch b/external/liborcus/0001-xls-xml-Pick-up-border-colors.patch new file mode 100644 index 000000000..1dff6bf93 --- /dev/null +++ b/external/liborcus/0001-xls-xml-Pick-up-border-colors.patch @@ -0,0 +1,69 @@ +From 0a4e8c44fc8229818191c6b9b46e4de079d0ca3b Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida <kohei.yoshida@gmail.com> +Date: Thu, 8 Feb 2018 17:59:11 -0500 +Subject: [PATCH] xls-xml: Pick up border colors. + +(cherry picked from commit e065d26dabafea465ec49e7d79775e62014ac0db) +--- + src/liborcus/xls_xml_context.cpp | 10 ++++++++++ + src/liborcus/xls_xml_context.hpp | 1 + + 2 files changed, 11 insertions(+) + +diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp +index 790dfed..917ff86 100644 +--- a/src/liborcus/xls_xml_context.cpp ++++ b/src/liborcus/xls_xml_context.cpp +@@ -1069,6 +1069,7 @@ void xls_xml_context::start_element_border(const xml_token_pair_t& parent, const + + spreadsheet::border_direction_t dir = spreadsheet::border_direction_t::unknown; + spreadsheet::border_style_t style = spreadsheet::border_style_t::unknown; ++ spreadsheet::color_rgb_t color; + long weight = 0; + + for (const xml_token_attr_t& attr : attrs) +@@ -1093,6 +1094,11 @@ void xls_xml_context::start_element_border(const xml_token_pair_t& parent, const + weight = to_long(attr.value); + break; + } ++ case XML_Color: ++ { ++ color = spreadsheet::to_color_rgb(attr.value.data(), attr.value.size()); ++ break; ++ } + default: + ; + } +@@ -1105,6 +1111,7 @@ void xls_xml_context::start_element_border(const xml_token_pair_t& parent, const + border_style_type& bs = m_current_style->borders.back(); + bs.dir = dir; + bs.style = style; ++ bs.color = color; + + switch (bs.style) + { +@@ -1525,7 +1532,10 @@ void xls_xml_context::commit_styles() + styles->set_border_count(style->borders.size()); + + for (const border_style_type& b : style->borders) ++ { + styles->set_border_style(b.dir, b.style); ++ styles->set_border_color(b.dir, 255, b.color.red, b.color.green, b.color.blue); ++ } + + size_t border_id = styles->commit_border(); + styles->set_xf_border(border_id); +diff --git a/src/liborcus/xls_xml_context.hpp b/src/liborcus/xls_xml_context.hpp +index 47cd01c..93dceca 100644 +--- a/src/liborcus/xls_xml_context.hpp ++++ b/src/liborcus/xls_xml_context.hpp +@@ -107,6 +107,7 @@ class xls_xml_context : public xml_context_base + { + spreadsheet::border_direction_t dir = spreadsheet::border_direction_t::unknown; + spreadsheet::border_style_t style = spreadsheet::border_style_t::unknown; ++ spreadsheet::color_rgb_t color; + }; + + struct font_style_type +-- +2.7.4 + diff --git a/external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch b/external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch new file mode 100644 index 000000000..ebb233ac7 --- /dev/null +++ b/external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch @@ -0,0 +1,49 @@ +From 473526e1ca3a7117e2daf977e1b82a0a3977fc84 Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida <kohei.yoshida@gmail.com> +Date: Wed, 31 Jan 2018 22:24:45 -0500 +Subject: [PATCH 2/2] We are supposed to use the foreground color for solid + fill. + +(cherry picked from commit f821995022df8dd1e580dd22cf131584b2b1ac4f) +--- + src/liborcus/odf_styles_context.cpp | 3 ++- + src/liborcus/odf_styles_context_test.cpp | 9 +++++---- + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/liborcus/odf_styles_context.cpp b/src/liborcus/odf_styles_context.cpp +index f9c422a..e5f1cc6 100644 +--- a/src/liborcus/odf_styles_context.cpp ++++ b/src/liborcus/odf_styles_context.cpp +@@ -739,7 +739,8 @@ void styles_context::start_element(xmlns_id_t ns, xml_token_t name, const std::v + { + spreadsheet::color_elem_t red, green, blue; + func.get_background_color(red, green, blue); +- mp_styles->set_fill_bg_color(255, red, green, blue); ++ mp_styles->set_fill_pattern_type(ORCUS_ASCII("solid")); ++ mp_styles->set_fill_fg_color(255, red, green, blue); + } + + size_t fill_id = mp_styles->commit_fill(); +diff --git a/src/liborcus/odf_styles_context_test.cpp b/src/liborcus/odf_styles_context_test.cpp +index 4c7eab5..7255a54 100644 +--- a/src/liborcus/odf_styles_context_test.cpp ++++ b/src/liborcus/odf_styles_context_test.cpp +@@ -48,10 +48,11 @@ void test_odf_fill(orcus::spreadsheet::import_styles &styles) + std::cerr << std::hex << (int)fill; + const orcus::spreadsheet::fill_t* cell_fill = styles.get_fill(fill); + assert(cell_fill); +- std::cerr << std::hex << (int)cell_fill->bg_color.red; +- assert(cell_fill->bg_color.red == 0xfe); +- assert(cell_fill->bg_color.green == 0xff); +- assert(cell_fill->bg_color.blue == 0xcc); ++ std::cerr << std::hex << (int)cell_fill->fg_color.red; ++ assert(cell_fill->fg_color.red == 0xfe); ++ assert(cell_fill->fg_color.green == 0xff); ++ assert(cell_fill->fg_color.blue == 0xcc); ++ assert(cell_fill->pattern_type == "solid"); + } + + void test_odf_border(orcus::spreadsheet::import_styles &styles) +-- +2.7.4 + diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk new file mode 100644 index 000000000..21dd1bfb1 --- /dev/null +++ b/external/liborcus/ExternalPackage_liborcus.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,liborcus,liborcus)) + +$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.0.dylib,src/liborcus/.libs/liborcus-0.15.0.dylib)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.0.dylib,src/parser/.libs/liborcus-parser-0.15.0.dylib)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.so.0,src/liborcus/.libs/liborcus-0.15.so.0.0.0)) +$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.so.0,src/parser/.libs/liborcus-parser-0.15.so.0.0.0)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk new file mode 100644 index 000000000..38658cc81 --- /dev/null +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -0,0 +1,132 @@ +# -*- 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 \ + boost_filesystem \ + boost_iostreams \ + boost_system \ + mdds_headers \ + 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 thus. + +# 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= +ifneq ($(SYSTEM_ZLIB),) +liborcus_LIBS+=-lz +endif +ifneq ($(SYSTEM_BOOST),) +liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB) $(BOOST_FILESYSTEM_LIB) +else +liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams -lboost_filesystem +endif +ifeq ($(OS),ANDROID) +liborcus_LIBS+=$(gb_STDLIBS) +endif + +liborcus_CPPCLAGS=$(CPPFLAGS) +ifeq ($(SYSTEM_ZLIB),) +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 iOS LINUX NETBSD OPENBSD,$(OS))) +ifneq (,$(gb_ENABLE_DBGUTIL)) +liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG +endif +endif + +liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED +liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS) +ifeq ($(COM),MSC) +liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS) +endif +ifeq ($(SYSTEM_BOOST),) +liborcus_CXXFLAGS+=${BOOST_CPPFLAGS} +else +liborcus_LDFLAGS+=$(BOOST_LDFLAGS) +endif +ifneq (,$(PTHREAD_LIBS)) +liborcus_LDFLAGS+=$(PTHREAD_LIBS) +endif + +ifeq ($(OS),LINUX) +liborcus_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\$$$$ORIGIN +endif + +ifeq ($(ENABLE_GDB_INDEX),TRUE) +liborcus_LDFLAGS+=-Wl,--gdb-index +liborcus_CXXFLAGS+=-ggnu-pubnames +ifneq ($(USE_LD),) +liborcus_LDFLAGS += -fuse-ld=$(USE_LD) +endif +endif + +$(call gb_ExternalProject_get_state_target,liborcus,build) : + $(call gb_Trace_StartRange,liborcus,EXTERNAL) + $(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)') \ + MDDS_CFLAGS='$(MDDS_CFLAGS)' \ + MDDS_LIBS=' ' \ + MAKE=$(MAKE) ./configure \ + --with-pic \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-spreadsheet-model \ + --without-tools \ + --disable-python \ + --disable-werror \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(SYSTEM_BOOST),,\ + --with-boost=$(WORKDIR)/UnpackedTarball/boost \ + boost_cv_lib_iostreams=yes \ + boost_cv_lib_system=yes \ + boost_cv_lib_filesystem=yes \ + ) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(if $(verbose),V=1) \ + $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.15.0.dylib \ + $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,liborcus,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk new file mode 100644 index 000000000..d3cbddbb8 --- /dev/null +++ b/external/liborcus/Library_orcus-parser.mk @@ -0,0 +1,71 @@ +# -*- 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_Library_Library,orcus-parser)) + +$(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus)) + +$(eval $(call gb_Library_use_externals,orcus-parser,\ + boost_headers \ + boost_filesystem \ + boost_system \ + mdds_headers \ + zlib \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,orcus-parser)) + +$(eval $(call gb_Library_set_precompiled_header,orcus-parser,external/liborcus/inc/pch/precompiled_orcus-parser)) + +$(eval $(call gb_Library_set_include,orcus-parser,\ + -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \ + -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,orcus-parser,\ + -DBOOST_ALL_NO_LIB \ + -D__ORCUS_PSR_BUILDING_DLL \ +)) + +# Needed when building against MSVC in C++17 mode, as +# workdir/UnpackedTarball/liborcus/include/orcus/global.hpp uses std::unary_function: +$(eval $(call gb_Library_add_defs,orcus-parser, \ + -D_HAS_AUTO_PTR_ETC=1 \ +)) + +$(eval $(call gb_Library_set_generated_cxx_suffix,orcus-parser,cpp)) + +$(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\ + UnpackedTarball/liborcus/src/parser/base64 \ + UnpackedTarball/liborcus/src/parser/cell_buffer \ + UnpackedTarball/liborcus/src/parser/css_parser_base \ + UnpackedTarball/liborcus/src/parser/css_types \ + UnpackedTarball/liborcus/src/parser/csv_parser_base \ + UnpackedTarball/liborcus/src/parser/exception \ + UnpackedTarball/liborcus/src/parser/json_global \ + UnpackedTarball/liborcus/src/parser/json_parser_base \ + UnpackedTarball/liborcus/src/parser/json_parser_thread \ + UnpackedTarball/liborcus/src/parser/parser_base \ + UnpackedTarball/liborcus/src/parser/parser_global \ + UnpackedTarball/liborcus/src/parser/pstring \ + UnpackedTarball/liborcus/src/parser/sax_parser_base \ + UnpackedTarball/liborcus/src/parser/sax_token_parser \ + UnpackedTarball/liborcus/src/parser/sax_token_parser_thread \ + UnpackedTarball/liborcus/src/parser/stream \ + UnpackedTarball/liborcus/src/parser/string_pool \ + UnpackedTarball/liborcus/src/parser/tokens \ + UnpackedTarball/liborcus/src/parser/types \ + UnpackedTarball/liborcus/src/parser/xml_namespace \ + UnpackedTarball/liborcus/src/parser/yaml_parser_base \ + UnpackedTarball/liborcus/src/parser/zip_archive \ + UnpackedTarball/liborcus/src/parser/zip_archive_stream \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk new file mode 100644 index 000000000..ea99e7509 --- /dev/null +++ b/external/liborcus/Library_orcus.mk @@ -0,0 +1,141 @@ +# -*- 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_Library_Library,orcus)) + +$(eval $(call gb_Library_use_unpacked,orcus,liborcus)) + +$(eval $(call gb_Library_use_externals,orcus,\ + boost_headers \ + boost_filesystem \ + boost_iostreams \ + boost_system \ + mdds_headers \ + zlib \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,orcus)) + +$(eval $(call gb_Library_set_precompiled_header,orcus,external/liborcus/inc/pch/precompiled_orcus)) + +$(eval $(call gb_Library_set_include,orcus,\ + -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \ + -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,orcus,\ + -DBOOST_ALL_NO_LIB \ + -D__ORCUS_BUILDING_DLL \ + -D__ORCUS_GNUMERIC \ + -D__ORCUS_ODS \ + -D__ORCUS_XLSX \ + -D__ORCUS_XLS_XML \ +)) + +# Needed when building against MSVC in C++17 mode, as +# workdir/UnpackedTarball/liborcus/src/liborcus/css_document_tree.cpp uses std::unary_function: +$(eval $(call gb_Library_add_defs,orcus, \ + -D_HAS_AUTO_PTR_ETC=1 \ +)) + +$(eval $(call gb_Library_use_libraries,orcus,\ + orcus-parser \ +)) + +$(eval $(call gb_Library_set_generated_cxx_suffix,orcus,cpp)) + +$(eval $(call gb_Library_add_generated_exception_objects,orcus,\ + UnpackedTarball/liborcus/src/liborcus/config \ + UnpackedTarball/liborcus/src/liborcus/css_document_tree \ + UnpackedTarball/liborcus/src/liborcus/css_selector \ + UnpackedTarball/liborcus/src/liborcus/detection_result \ + UnpackedTarball/liborcus/src/liborcus/dom_tree \ + UnpackedTarball/liborcus/src/liborcus/format_detection \ + UnpackedTarball/liborcus/src/liborcus/formula_result \ + UnpackedTarball/liborcus/src/liborcus/global \ + UnpackedTarball/liborcus/src/liborcus/gnumeric_cell_context \ + UnpackedTarball/liborcus/src/liborcus/gnumeric_context \ + UnpackedTarball/liborcus/src/liborcus/gnumeric_detection_handler \ + UnpackedTarball/liborcus/src/liborcus/gnumeric_handler \ + UnpackedTarball/liborcus/src/liborcus/gnumeric_helper \ + UnpackedTarball/liborcus/src/liborcus/gnumeric_namespace_types \ + UnpackedTarball/liborcus/src/liborcus/gnumeric_sheet_context \ + UnpackedTarball/liborcus/src/liborcus/gnumeric_tokens \ + UnpackedTarball/liborcus/src/liborcus/info \ + UnpackedTarball/liborcus/src/liborcus/interface \ + UnpackedTarball/liborcus/src/liborcus/json_document_tree \ + UnpackedTarball/liborcus/src/liborcus/json_map_tree \ + UnpackedTarball/liborcus/src/liborcus/json_structure_mapper \ + UnpackedTarball/liborcus/src/liborcus/json_structure_tree \ + UnpackedTarball/liborcus/src/liborcus/json_util \ + UnpackedTarball/liborcus/src/liborcus/measurement \ + UnpackedTarball/liborcus/src/liborcus/odf_helper \ + UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \ + UnpackedTarball/liborcus/src/liborcus/odf_number_formatting_context \ + UnpackedTarball/liborcus/src/liborcus/odf_para_context \ + UnpackedTarball/liborcus/src/liborcus/odf_styles \ + UnpackedTarball/liborcus/src/liborcus/odf_styles_context \ + UnpackedTarball/liborcus/src/liborcus/odf_tokens \ + UnpackedTarball/liborcus/src/liborcus/ods_content_xml_context \ + UnpackedTarball/liborcus/src/liborcus/ods_content_xml_handler \ + UnpackedTarball/liborcus/src/liborcus/ods_session_data \ + UnpackedTarball/liborcus/src/liborcus/ooxml_content_types \ + UnpackedTarball/liborcus/src/liborcus/ooxml_global \ + UnpackedTarball/liborcus/src/liborcus/ooxml_namespace_types \ + UnpackedTarball/liborcus/src/liborcus/ooxml_schemas \ + UnpackedTarball/liborcus/src/liborcus/ooxml_tokens \ + UnpackedTarball/liborcus/src/liborcus/ooxml_types \ + UnpackedTarball/liborcus/src/liborcus/opc_context \ + UnpackedTarball/liborcus/src/liborcus/opc_reader \ + UnpackedTarball/liborcus/src/liborcus/orcus_csv \ + UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \ + UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \ + UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \ + UnpackedTarball/liborcus/src/liborcus/orcus_json \ + UnpackedTarball/liborcus/src/liborcus/orcus_ods \ + UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \ + UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \ + UnpackedTarball/liborcus/src/liborcus/orcus_xml \ + UnpackedTarball/liborcus/src/liborcus/orcus_xml_map_def \ + UnpackedTarball/liborcus/src/liborcus/session_context \ + UnpackedTarball/liborcus/src/liborcus/spreadsheet_iface_util \ + UnpackedTarball/liborcus/src/liborcus/spreadsheet_impl_types \ + UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \ + UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \ + UnpackedTarball/liborcus/src/liborcus/string_helper \ + UnpackedTarball/liborcus/src/liborcus/xls_xml_context \ + UnpackedTarball/liborcus/src/liborcus/xls_xml_detection_handler \ + UnpackedTarball/liborcus/src/liborcus/xls_xml_handler \ + UnpackedTarball/liborcus/src/liborcus/xls_xml_namespace_types \ + UnpackedTarball/liborcus/src/liborcus/xls_xml_tokens \ + UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_drawing_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_handler \ + UnpackedTarball/liborcus/src/liborcus/xlsx_helper \ + UnpackedTarball/liborcus/src/liborcus/xlsx_pivot_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_revision_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_session_data \ + UnpackedTarball/liborcus/src/liborcus/xlsx_sheet_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_table_context \ + UnpackedTarball/liborcus/src/liborcus/xlsx_types \ + UnpackedTarball/liborcus/src/liborcus/xlsx_workbook_context \ + UnpackedTarball/liborcus/src/liborcus/xml_context_base \ + UnpackedTarball/liborcus/src/liborcus/xml_context_global \ + UnpackedTarball/liborcus/src/liborcus/xml_map_tree \ + UnpackedTarball/liborcus/src/liborcus/xml_simple_stream_handler \ + UnpackedTarball/liborcus/src/liborcus/xml_stream_handler \ + UnpackedTarball/liborcus/src/liborcus/xml_stream_parser \ + UnpackedTarball/liborcus/src/liborcus/xml_structure_tree \ + UnpackedTarball/liborcus/src/liborcus/yaml_document_tree \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/liborcus/Makefile b/external/liborcus/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/liborcus/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/liborcus/Module_liborcus.mk b/external/liborcus/Module_liborcus.mk new file mode 100644 index 000000000..e75b983ba --- /dev/null +++ b/external/liborcus/Module_liborcus.mk @@ -0,0 +1,32 @@ +# -*- 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)) + +$(eval $(call gb_Module_add_targets,liborcus,\ + UnpackedTarball_liborcus \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,liborcus,\ + Library_orcus \ + Library_orcus-parser \ +)) + +else # !MSC + +$(eval $(call gb_Module_add_targets,liborcus,\ + ExternalPackage_liborcus \ + ExternalProject_liborcus \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/liborcus/README b/external/liborcus/README new file mode 100644 index 000000000..54e882663 --- /dev/null +++ b/external/liborcus/README @@ -0,0 +1,2 @@ +[https://gitlab.com/orcus/orcus] +"Collection of parsers and import filters for spreadsheet documents." diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk new file mode 100644 index 000000000..e5e33b0b1 --- /dev/null +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -0,0 +1,31 @@ +# -*- 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,1)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) + +$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ + external/liborcus/rpath.patch.0 \ + external/liborcus/gcc9.patch.0 \ + external/liborcus/libtool.patch.0 \ + external/liborcus/fix-pch.patch.0 \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ + external/liborcus/windows-constants-hack.patch \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/liborcus/fix-pch.patch.0 b/external/liborcus/fix-pch.patch.0 new file mode 100644 index 000000000..42a9d52d9 --- /dev/null +++ b/external/liborcus/fix-pch.patch.0 @@ -0,0 +1,11 @@ +--- src/liborcus/gnumeric_cell_context.cpp.sav 2018-05-27 18:18:56.000000000 +0200 ++++ src/liborcus/gnumeric_cell_context.cpp 2019-10-13 10:43:24.587258400 +0200 +@@ -248,7 +248,7 @@ + range.last.column = col + mp_cell_data->array_cols - 1; + range.last.row = row + mp_cell_data->array_rows - 1; + +- iface::import_array_formula* af = mp_sheet->get_array_formula(); ++ spreadsheet::iface::import_array_formula* af = mp_sheet->get_array_formula(); + if (af) + { + af->set_range(range); diff --git a/external/liborcus/gcc9.patch.0 b/external/liborcus/gcc9.patch.0 new file mode 100644 index 000000000..f89b1dddc --- /dev/null +++ b/external/liborcus/gcc9.patch.0 @@ -0,0 +1,28 @@ +--- include/orcus/types.hpp ++++ include/orcus/types.hpp +@@ -7,6 +7,14 @@ + + #ifndef INCLUDED_ORCUS_TYPES_HPP + #define INCLUDED_ORCUS_TYPES_HPP ++ ++#ifdef __GNUC__ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wpragmas" // for old GCC ++#pragma GCC diagnostic ignored "-Wunknown-warning-option" // for Clang ++#pragma GCC diagnostic ignored "-Wdeprecated-copy" ++#pragma GCC diagnostic ignored "-Wshadow" ++#endif + + #include <cstdlib> + #include <vector> +@@ -145,6 +152,10 @@ + typedef ::std::vector<xml_token_attr_t> xml_attrs_t; + + } ++ ++#ifdef __GNUC__ ++#pragma GCC diagnostic pop ++#endif + + #endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/liborcus/inc/pch/precompiled_orcus-parser.cxx b/external/liborcus/inc/pch/precompiled_orcus-parser.cxx new file mode 100644 index 000000000..b93db182c --- /dev/null +++ b/external/liborcus/inc/pch/precompiled_orcus-parser.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_orcus-parser.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/liborcus/inc/pch/precompiled_orcus-parser.hxx b/external/liborcus/inc/pch/precompiled_orcus-parser.hxx new file mode 100644 index 000000000..9c16a9735 --- /dev/null +++ b/external/liborcus/inc/pch/precompiled_orcus-parser.hxx @@ -0,0 +1,88 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2019-10-13 10:38:02 using: + ./bin/update_pch external/liborcus orcus-parser --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/liborcus/inc/pch/precompiled_orcus-parser.hxx "make external/liborcus.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <algorithm> +#include <cassert> +#include <cctype> +#include <cmath> +#include <codecvt> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <deque> +#include <fstream> +#include <iostream> +#include <limits> +#include <locale> +#include <memory> +#include <sstream> +#include <tuple> +#include <unordered_map> +#include <unordered_set> +#include <vector> +#include <zconf.h> +#include <zlib.h> +#include <boost/archive/iterators/base64_from_binary.hpp> +#include <boost/archive/iterators/binary_from_base64.hpp> +#include <boost/archive/iterators/transform_width.hpp> +#include <boost/filesystem.hpp> +#include <boost/interprocess/file_mapping.hpp> +#include <boost/interprocess/mapped_region.hpp> +#include <boost/pool/object_pool.hpp> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <mdds/global.hpp> +#include <mdds/sorted_string_map.hpp> +#include <orcus/base64.hpp> +#include <orcus/cell_buffer.hpp> +#include <orcus/css_parser_base.hpp> +#include <orcus/css_types.hpp> +#include <orcus/csv_parser_base.hpp> +#include <orcus/detail/parser_token_buffer.hpp> +#include <orcus/exception.hpp> +#include <orcus/global.hpp> +#include <orcus/json_global.hpp> +#include <orcus/json_parser.hpp> +#include <orcus/json_parser_base.hpp> +#include <orcus/json_parser_thread.hpp> +#include <orcus/parser_base.hpp> +#include <orcus/parser_global.hpp> +#include <orcus/pstring.hpp> +#include <orcus/sax_parser_base.hpp> +#include <orcus/sax_token_parser.hpp> +#include <orcus/sax_token_parser_thread.hpp> +#include <orcus/stream.hpp> +#include <orcus/string_pool.hpp> +#include <orcus/tokens.hpp> +#include <orcus/types.hpp> +#include <orcus/xml_namespace.hpp> +#include <orcus/yaml_parser_base.hpp> +#include <orcus/zip_archive.hpp> +#include <orcus/zip_archive_stream.hpp> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/liborcus/inc/pch/precompiled_orcus.cxx b/external/liborcus/inc/pch/precompiled_orcus.cxx new file mode 100644 index 000000000..03b0cdf02 --- /dev/null +++ b/external/liborcus/inc/pch/precompiled_orcus.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_orcus.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/liborcus/inc/pch/precompiled_orcus.hxx b/external/liborcus/inc/pch/precompiled_orcus.hxx new file mode 100644 index 000000000..28e1bc811 --- /dev/null +++ b/external/liborcus/inc/pch/precompiled_orcus.hxx @@ -0,0 +1,109 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2020-02-01 12:22:35 using: + ./bin/update_pch external/liborcus orcus --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/liborcus/inc/pch/precompiled_orcus.hxx "make external/liborcus.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <algorithm> +#include <cassert> +#include <codecvt> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <deque> +#include <fstream> +#include <functional> +#include <iostream> +#include <iterator> +#include <limits> +#include <locale> +#include <map> +#include <memory> +#include <ostream> +#include <sstream> +#include <string> +#include <unordered_map> +#include <unordered_set> +#include <vector> +#include <boost/current_function.hpp> +#include <boost/filesystem.hpp> +#include <boost/iostreams/filter/gzip.hpp> +#include <boost/iostreams/filtering_stream.hpp> +#include <boost/optional.hpp> +#include <boost/pool/object_pool.hpp> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <mdds/global.hpp> +#include <mdds/sorted_string_map.hpp> +#include <orcus/config.hpp> +#include <orcus/css_document_tree.hpp> +#include <orcus/css_parser.hpp> +#include <orcus/css_selector.hpp> +#include <orcus/csv_parser.hpp> +#include <orcus/dom_tree.hpp> +#include <orcus/exception.hpp> +#include <orcus/format_detection.hpp> +#include <orcus/global.hpp> +#include <orcus/info.hpp> +#include <orcus/interface.hpp> +#include <orcus/json_document_tree.hpp> +#include <orcus/json_global.hpp> +#include <orcus/json_parser.hpp> +#include <orcus/json_structure_tree.hpp> +#include <orcus/measurement.hpp> +#include <orcus/orcus_csv.hpp> +#include <orcus/orcus_gnumeric.hpp> +#include <orcus/orcus_import_ods.hpp> +#include <orcus/orcus_import_xlsx.hpp> +#include <orcus/orcus_json.hpp> +#include <orcus/orcus_ods.hpp> +#include <orcus/orcus_xls_xml.hpp> +#include <orcus/orcus_xlsx.hpp> +#include <orcus/orcus_xml.hpp> +#include <orcus/parser_base.hpp> +#include <orcus/parser_global.hpp> +#include <orcus/pstring.hpp> +#include <orcus/sax_ns_parser.hpp> +#include <orcus/sax_parser.hpp> +#include <orcus/sax_parser_base.hpp> +#include <orcus/sax_token_parser.hpp> +#include <orcus/spreadsheet/export_interface.hpp> +#include <orcus/spreadsheet/import_interface.hpp> +#include <orcus/spreadsheet/import_interface_pivot.hpp> +#include <orcus/spreadsheet/import_interface_view.hpp> +#include <orcus/spreadsheet/styles.hpp> +#include <orcus/spreadsheet/types.hpp> +#include <orcus/stream.hpp> +#include <orcus/string_pool.hpp> +#include <orcus/threaded_sax_token_parser.hpp> +#include <orcus/tokens.hpp> +#include <orcus/xml_namespace.hpp> +#include <orcus/xml_structure_tree.hpp> +#include <orcus/yaml_document_tree.hpp> +#include <orcus/yaml_parser.hpp> +#include <orcus/zip_archive.hpp> +#include <orcus/zip_archive_stream.hpp> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/liborcus/libtool.patch.0 b/external/liborcus/libtool.patch.0 new file mode 100644 index 000000000..93b677303 --- /dev/null +++ b/external/liborcus/libtool.patch.0 @@ -0,0 +1,11 @@ +--- ltmain.sh.sav 2018-09-14 23:47:13.000000000 +0200 ++++ ltmain.sh 2019-05-05 23:11:30.406904472 +0200 +@@ -7278,7 +7278,7 @@ func_mode_link () + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ +- -specs=*|-fsanitize=*) ++ -specs=*|-fsanitize=*|-fuse-ld=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" diff --git a/external/liborcus/rpath.patch.0 b/external/liborcus/rpath.patch.0 new file mode 100644 index 000000000..e7a33e693 --- /dev/null +++ b/external/liborcus/rpath.patch.0 @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -14007,6 +14007,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) diff --git a/external/liborcus/windows-constants-hack.patch b/external/liborcus/windows-constants-hack.patch new file mode 100644 index 000000000..876bc1688 --- /dev/null +++ b/external/liborcus/windows-constants-hack.patch @@ -0,0 +1,15 @@ +diff --git a/src/liborcus/info.cpp b/src/liborcus/info.cpp +index ae571f5..539ce18 100644 +--- a/src/liborcus/info.cpp ++++ b/src/liborcus/info.cpp +@@ -7,7 +7,9 @@ + + #include "orcus/info.hpp" + +-#include "constants.inl" ++#define ORCUS_MAJOR_VERSION 0 ++#define ORCUS_MINOR_VERSION 11 ++#define ORCUS_MICRO_VERSION 0 + + namespace orcus { + diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk b/external/libpagemaker/ExternalProject_libpagemaker.mk new file mode 100644 index 000000000..34254b872 --- /dev/null +++ b/external/libpagemaker/ExternalProject_libpagemaker.mk @@ -0,0 +1,44 @@ +# -*- 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,libpagemaker)) + +$(eval $(call gb_ExternalProject_use_autoconf,libpagemaker,build)) + +$(eval $(call gb_ExternalProject_register_targets,libpagemaker,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libpagemaker,\ + boost_headers \ + revenge \ +)) + +$(call gb_ExternalProject_get_state_target,libpagemaker,build) : + $(call gb_Trace_StartRange,libpagemaker,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-tools \ + --disable-debug \ + --disable-werror \ + --disable-weffc \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libpagemaker,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libpagemaker/Makefile b/external/libpagemaker/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libpagemaker/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/libpagemaker/Module_libpagemaker.mk b/external/libpagemaker/Module_libpagemaker.mk new file mode 100644 index 000000000..4888775fa --- /dev/null +++ b/external/libpagemaker/Module_libpagemaker.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,libpagemaker)) + +$(eval $(call gb_Module_add_targets,libpagemaker,\ + ExternalProject_libpagemaker \ + UnpackedTarball_libpagemaker \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libpagemaker/README b/external/libpagemaker/README new file mode 100644 index 000000000..309aa82fe --- /dev/null +++ b/external/libpagemaker/README @@ -0,0 +1,3 @@ +Library parsing Adobe PageMaker documents. + +[https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker] diff --git a/external/libpagemaker/UnpackedTarball_libpagemaker.mk b/external/libpagemaker/UnpackedTarball_libpagemaker.mk new file mode 100644 index 000000000..752d5c0eb --- /dev/null +++ b/external/libpagemaker/UnpackedTarball_libpagemaker.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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libpagemaker)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libpagemaker,$(PAGEMAKER_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libpagemaker)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libpng/Makefile b/external/libpng/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libpng/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/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk new file mode 100644 index 000000000..f8f834d0e --- /dev/null +++ b/external/libpng/Module_libpng.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,libpng)) + +$(eval $(call gb_Module_add_targets,libpng,\ + StaticLibrary_libpng \ + UnpackedTarball_libpng \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libpng/README b/external/libpng/README new file mode 100644 index 000000000..8b9c89611 --- /dev/null +++ b/external/libpng/README @@ -0,0 +1 @@ +libpng is the official PNG reference library, from [http://www.libpng.org/] diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk new file mode 100644 index 000000000..fe2364141 --- /dev/null +++ b/external/libpng/StaticLibrary_libpng.mk @@ -0,0 +1,43 @@ +# -*- 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_StaticLibrary_StaticLibrary,libpng)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,libpng)) + +$(eval $(call gb_StaticLibrary_use_unpacked,libpng,libpng)) + +$(eval $(call gb_StaticLibrary_use_externals,libpng,\ + zlib \ +)) + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\ + UnpackedTarball/libpng/png \ + UnpackedTarball/libpng/pngerror \ + UnpackedTarball/libpng/pngget \ + UnpackedTarball/libpng/pngmem \ + UnpackedTarball/libpng/pngpread \ + UnpackedTarball/libpng/pngread \ + UnpackedTarball/libpng/pngrio \ + UnpackedTarball/libpng/pngrtran \ + UnpackedTarball/libpng/pngrutil \ + UnpackedTarball/libpng/pngset \ + UnpackedTarball/libpng/pngtrans \ + UnpackedTarball/libpng/pngwio \ + UnpackedTarball/libpng/pngwrite \ + UnpackedTarball/libpng/pngwtran \ + UnpackedTarball/libpng/pngwutil \ + $(if $(filter ARM AARCH64 ARM64,$(CPUNAME)),\ + UnpackedTarball/libpng/arm/arm_init \ + UnpackedTarball/libpng/arm/filter_neon_intrinsics \ + UnpackedTarball/libpng/arm/palette_neon_intrinsics \ + ) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libpng/UnpackedTarball_libpng.mk b/external/libpng/UnpackedTarball_libpng.mk new file mode 100644 index 000000000..2a8ad3f84 --- /dev/null +++ b/external/libpng/UnpackedTarball_libpng.mk @@ -0,0 +1,22 @@ +# -*- 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,libpng)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libpng,$(LIBPNG_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_files,libpng,.,\ + external/libpng/configs/pnglibconf.h \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,libpng,\ + external/libpng/libpng-osx.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libpng/configs/pnglibconf.h b/external/libpng/configs/pnglibconf.h new file mode 100644 index 000000000..ff5d156a6 --- /dev/null +++ b/external/libpng/configs/pnglibconf.h @@ -0,0 +1,214 @@ +/* libpng 1.6.19 STANDARD API DEFINITION */ + +/* pnglibconf.h - library build configuration */ + +/* Libpng version 1.6.19 - November 12, 2015 */ + +/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ + +/* This code is released under the libpng license. */ +/* For conditions of distribution and use, see the disclaimer */ +/* and license in png.h */ + +/* pnglibconf.h */ +/* Machine generated file: DO NOT EDIT */ +/* Derived from: scripts/pnglibconf.dfa */ +#ifndef PNGLCONF_H +#define PNGLCONF_H +/* options */ +#define PNG_16BIT_SUPPORTED +#define PNG_ALIGNED_MEMORY_SUPPORTED +/*#undef PNG_ARM_NEON_API_SUPPORTED*/ +/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/ +#define PNG_BENIGN_ERRORS_SUPPORTED +#define PNG_BENIGN_READ_ERRORS_SUPPORTED +/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/ +#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED +#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED +#define PNG_COLORSPACE_SUPPORTED +#define PNG_CONSOLE_IO_SUPPORTED +#define PNG_CONVERT_tIME_SUPPORTED +#define PNG_EASY_ACCESS_SUPPORTED +/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/ +#define PNG_ERROR_TEXT_SUPPORTED +#define PNG_FIXED_POINT_SUPPORTED +#define PNG_FLOATING_ARITHMETIC_SUPPORTED +#define PNG_FLOATING_POINT_SUPPORTED +#define PNG_FORMAT_AFIRST_SUPPORTED +#define PNG_FORMAT_BGR_SUPPORTED +#define PNG_GAMMA_SUPPORTED +#define PNG_GET_PALETTE_MAX_SUPPORTED +#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED +#define PNG_INCH_CONVERSIONS_SUPPORTED +#define PNG_INFO_IMAGE_SUPPORTED +#define PNG_IO_STATE_SUPPORTED +#define PNG_MNG_FEATURES_SUPPORTED +#define PNG_POINTER_INDEXING_SUPPORTED +#define PNG_PROGRESSIVE_READ_SUPPORTED +#define PNG_READ_16BIT_SUPPORTED +#define PNG_READ_ALPHA_MODE_SUPPORTED +#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED +#define PNG_READ_BACKGROUND_SUPPORTED +#define PNG_READ_BGR_SUPPORTED +#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED +#define PNG_READ_COMPOSITE_NODIV_SUPPORTED +#define PNG_READ_COMPRESSED_TEXT_SUPPORTED +#define PNG_READ_EXPAND_16_SUPPORTED +#define PNG_READ_EXPAND_SUPPORTED +#define PNG_READ_FILLER_SUPPORTED +#define PNG_READ_GAMMA_SUPPORTED +#define PNG_READ_GET_PALETTE_MAX_SUPPORTED +#define PNG_READ_GRAY_TO_RGB_SUPPORTED +#define PNG_READ_INTERLACING_SUPPORTED +#define PNG_READ_INT_FUNCTIONS_SUPPORTED +#define PNG_READ_INVERT_ALPHA_SUPPORTED +#define PNG_READ_INVERT_SUPPORTED +#define PNG_READ_OPT_PLTE_SUPPORTED +#define PNG_READ_PACKSWAP_SUPPORTED +#define PNG_READ_PACK_SUPPORTED +#define PNG_READ_QUANTIZE_SUPPORTED +#define PNG_READ_RGB_TO_GRAY_SUPPORTED +#define PNG_READ_SCALE_16_TO_8_SUPPORTED +#define PNG_READ_SHIFT_SUPPORTED +#define PNG_READ_STRIP_16_TO_8_SUPPORTED +#define PNG_READ_STRIP_ALPHA_SUPPORTED +#define PNG_READ_SUPPORTED +#define PNG_READ_SWAP_ALPHA_SUPPORTED +#define PNG_READ_SWAP_SUPPORTED +#define PNG_READ_TEXT_SUPPORTED +#define PNG_READ_TRANSFORMS_SUPPORTED +#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_READ_USER_CHUNKS_SUPPORTED +#define PNG_READ_USER_TRANSFORM_SUPPORTED +#define PNG_READ_bKGD_SUPPORTED +#define PNG_READ_cHRM_SUPPORTED +#define PNG_READ_gAMA_SUPPORTED +#define PNG_READ_hIST_SUPPORTED +#define PNG_READ_iCCP_SUPPORTED +#define PNG_READ_iTXt_SUPPORTED +#define PNG_READ_oFFs_SUPPORTED +#define PNG_READ_pCAL_SUPPORTED +#define PNG_READ_pHYs_SUPPORTED +#define PNG_READ_sBIT_SUPPORTED +#define PNG_READ_sCAL_SUPPORTED +#define PNG_READ_sPLT_SUPPORTED +#define PNG_READ_sRGB_SUPPORTED +#define PNG_READ_tEXt_SUPPORTED +#define PNG_READ_tIME_SUPPORTED +#define PNG_READ_tRNS_SUPPORTED +#define PNG_READ_zTXt_SUPPORTED +#define PNG_SAVE_INT_32_SUPPORTED +#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_SEQUENTIAL_READ_SUPPORTED +#define PNG_SETJMP_SUPPORTED +#define PNG_SET_OPTION_SUPPORTED +#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_SET_USER_LIMITS_SUPPORTED +#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED +#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED +#define PNG_SIMPLIFIED_READ_SUPPORTED +#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED +#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED +#define PNG_SIMPLIFIED_WRITE_SUPPORTED +#define PNG_STDIO_SUPPORTED +#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_TEXT_SUPPORTED +#define PNG_TIME_RFC1123_SUPPORTED +#define PNG_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_USER_CHUNKS_SUPPORTED +#define PNG_USER_LIMITS_SUPPORTED +#define PNG_USER_MEM_SUPPORTED +#define PNG_USER_TRANSFORM_INFO_SUPPORTED +#define PNG_USER_TRANSFORM_PTR_SUPPORTED +#define PNG_WARNINGS_SUPPORTED +#define PNG_WRITE_16BIT_SUPPORTED +#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED +#define PNG_WRITE_BGR_SUPPORTED +#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED +#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED +#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED +#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED +#define PNG_WRITE_FILLER_SUPPORTED +#define PNG_WRITE_FILTER_SUPPORTED +#define PNG_WRITE_FLUSH_SUPPORTED +#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED +#define PNG_WRITE_INTERLACING_SUPPORTED +#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED +#define PNG_WRITE_INVERT_ALPHA_SUPPORTED +#define PNG_WRITE_INVERT_SUPPORTED +#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED +#define PNG_WRITE_PACKSWAP_SUPPORTED +#define PNG_WRITE_PACK_SUPPORTED +#define PNG_WRITE_SHIFT_SUPPORTED +#define PNG_WRITE_SUPPORTED +#define PNG_WRITE_SWAP_ALPHA_SUPPORTED +#define PNG_WRITE_SWAP_SUPPORTED +#define PNG_WRITE_TEXT_SUPPORTED +#define PNG_WRITE_TRANSFORMS_SUPPORTED +#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_WRITE_USER_TRANSFORM_SUPPORTED +#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED +#define PNG_WRITE_bKGD_SUPPORTED +#define PNG_WRITE_cHRM_SUPPORTED +#define PNG_WRITE_gAMA_SUPPORTED +#define PNG_WRITE_hIST_SUPPORTED +#define PNG_WRITE_iCCP_SUPPORTED +#define PNG_WRITE_iTXt_SUPPORTED +#define PNG_WRITE_oFFs_SUPPORTED +#define PNG_WRITE_pCAL_SUPPORTED +#define PNG_WRITE_pHYs_SUPPORTED +#define PNG_WRITE_sBIT_SUPPORTED +#define PNG_WRITE_sCAL_SUPPORTED +#define PNG_WRITE_sPLT_SUPPORTED +#define PNG_WRITE_sRGB_SUPPORTED +#define PNG_WRITE_tEXt_SUPPORTED +#define PNG_WRITE_tIME_SUPPORTED +#define PNG_WRITE_tRNS_SUPPORTED +#define PNG_WRITE_zTXt_SUPPORTED +#define PNG_bKGD_SUPPORTED +#define PNG_cHRM_SUPPORTED +#define PNG_gAMA_SUPPORTED +#define PNG_hIST_SUPPORTED +#define PNG_iCCP_SUPPORTED +#define PNG_iTXt_SUPPORTED +#define PNG_oFFs_SUPPORTED +#define PNG_pCAL_SUPPORTED +#define PNG_pHYs_SUPPORTED +#define PNG_sBIT_SUPPORTED +#define PNG_sCAL_SUPPORTED +#define PNG_sPLT_SUPPORTED +#define PNG_sRGB_SUPPORTED +#define PNG_tEXt_SUPPORTED +#define PNG_tIME_SUPPORTED +#define PNG_tRNS_SUPPORTED +#define PNG_zTXt_SUPPORTED +/* end of options */ +/* settings */ +#define PNG_API_RULE 0 +#define PNG_DEFAULT_READ_MACROS 1 +#define PNG_GAMMA_THRESHOLD_FIXED 5000 +#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE +#define PNG_INFLATE_BUF_SIZE 1024 +#define PNG_LINKAGE_API extern +#define PNG_LINKAGE_CALLBACK extern +#define PNG_LINKAGE_DATA extern +#define PNG_LINKAGE_FUNCTION extern +#define PNG_MAX_GAMMA_8 11 +#define PNG_QUANTIZE_BLUE_BITS 5 +#define PNG_QUANTIZE_GREEN_BITS 5 +#define PNG_QUANTIZE_RED_BITS 5 +#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1) +#define PNG_TEXT_Z_DEFAULT_STRATEGY 0 +#define PNG_USER_CHUNK_CACHE_MAX 1000 +#define PNG_USER_CHUNK_MALLOC_MAX 8000000 +#define PNG_USER_HEIGHT_MAX 1000000 +#define PNG_USER_WIDTH_MAX 1000000 +#define PNG_ZBUF_SIZE 8192 +#define PNG_ZLIB_VERNUM 0 /* unknown */ +#define PNG_Z_DEFAULT_COMPRESSION (-1) +#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0 +#define PNG_Z_DEFAULT_STRATEGY 1 +#define PNG_sCAL_PRECISION 5 +#define PNG_sRGB_PROFILE_CHECKS 2 +/* end of settings */ +#endif /* PNGLCONF_H */ diff --git a/external/libpng/libpng-osx.patch.1 b/external/libpng/libpng-osx.patch.1 new file mode 100644 index 000000000..0e9d7336a --- /dev/null +++ b/external/libpng/libpng-osx.patch.1 @@ -0,0 +1,16 @@ +-*- Mode: Diff -*- + +Avoid warning: 'inflateValidate' is only available on macOS 10.13 or newer [-Wunguarded-availability-new] + +--- a/pngrutil.c ++++ b/pngrutil.c +@@ -419,7 +419,8 @@ + } + + #if ZLIB_VERNUM >= 0x1290 && \ +- defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32) ++ defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32) && \ ++ !(defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED < 101300) + if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON) + /* Turn off validation of the ADLER32 checksum in IDAT chunks */ + ret = inflateValidate(&png_ptr->zstream, 0); diff --git a/external/libqxp/ExternalProject_libqxp.mk b/external/libqxp/ExternalProject_libqxp.mk new file mode 100644 index 000000000..f1b63f6bf --- /dev/null +++ b/external/libqxp/ExternalProject_libqxp.mk @@ -0,0 +1,47 @@ +# -*- 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,libqxp)) + +$(eval $(call gb_ExternalProject_use_autoconf,libqxp,build)) + +$(eval $(call gb_ExternalProject_register_targets,libqxp,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libqxp,\ + boost_headers \ + icu \ + revenge \ +)) + +$(call gb_ExternalProject_get_state_target,libqxp,build) : + $(call gb_Trace_StartRange,libqxp,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-tests \ + --disable-tools \ + --disable-debug \ + --disable-werror \ + --disable-weffc \ + $(if $(gb_FULLDEPS),,--disable-dependency-tracking) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libqxp,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libqxp/Makefile b/external/libqxp/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libqxp/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/libqxp/Module_libqxp.mk b/external/libqxp/Module_libqxp.mk new file mode 100644 index 000000000..8359683da --- /dev/null +++ b/external/libqxp/Module_libqxp.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,libqxp)) + +$(eval $(call gb_Module_add_targets,libqxp,\ + ExternalProject_libqxp \ + UnpackedTarball_libqxp \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libqxp/README b/external/libqxp/README new file mode 100644 index 000000000..6f13b86fe --- /dev/null +++ b/external/libqxp/README @@ -0,0 +1,4 @@ +libqxp is a library and a set of tools for reading and converting +QuarkXPress file format. It supports versions 3.1-4.1 currently. + +[https://wiki.documentfoundation.org/DLP/Libraries/libqxp] diff --git a/external/libqxp/UnpackedTarball_libqxp.mk b/external/libqxp/UnpackedTarball_libqxp.mk new file mode 100644 index 000000000..0ac69bc6f --- /dev/null +++ b/external/libqxp/UnpackedTarball_libqxp.mk @@ -0,0 +1,20 @@ +# -*- 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,libqxp)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libqxp,$(QXP_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libqxp)) + +$(eval $(call gb_UnpackedTarball_add_patches,libqxp, \ + external/libqxp/android-workaround.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libqxp/android-workaround.patch.1 b/external/libqxp/android-workaround.patch.1 new file mode 100644 index 000000000..5c7529c20 --- /dev/null +++ b/external/libqxp/android-workaround.patch.1 @@ -0,0 +1,49 @@ +--- libqxp.orig/src/lib/QXP4Parser.cpp 2017-08-28 10:12:26.009868397 +0200 ++++ libqxp/src/lib/QXP4Parser.cpp 2017-08-28 10:12:39.577681705 +0200 +@@ -16,6 +16,7 @@ + #include "QXP4Header.h" + #include "QXPCollector.h" + #include "QXPMemoryStream.h" ++#include "android-compat.h" + + namespace libqxp + { +--- libqxp.orig/src/lib/QXPParser.cpp 2017-08-28 10:11:14.074858068 +0200 ++++ libqxp/src/lib/QXPParser.cpp 2017-08-28 10:18:04.849203430 +0200 +@@ -14,6 +14,7 @@ + + #include <cmath> + #include <memory> ++#include "android-compat.h" + + namespace libqxp + { +--- libqxp.orig/src/lib/QXPTypes.cpp 2017-08-26 08:38:40.000000000 +0200 ++++ libqxp/src/lib/QXPTypes.cpp 2017-08-28 10:18:37.784749714 +0200 +@@ -11,6 +11,7 @@ + + #include <boost/math/constants/constants.hpp> + #include <cmath> ++#include "android-compat.h" + + namespace libqxp + { +--- libqxp.orig/src/lib/android-compat.h 1970-01-01 01:00:00.000000000 +0100 ++++ libqxp/src/lib/android-compat.h 2017-08-28 10:21:36.766283262 +0200 +@@ -0,0 +1,16 @@ ++#if defined(__ANDROID__) ++namespace std ++{ ++template<typename T> ++T round(T x) ++{ ++ return ::round(x); ++} ++ ++template<typename T> ++T hypot(T x, T y) ++{ ++ return ::hypot(x, y); ++} ++} ++#endif diff --git a/external/librevenge/ExternalPackage_librevenge.mk b/external/librevenge/ExternalPackage_librevenge.mk new file mode 100644 index 000000000..4ed404c63 --- /dev/null +++ b/external/librevenge/ExternalPackage_librevenge.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,librevenge,librevenge)) + +$(eval $(call gb_ExternalPackage_use_external_project,librevenge,librevenge)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.0.dylib,src/lib/.libs/librevenge-0.0.0.dylib)) +else ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.dll,src/lib/.libs/librevenge-0.0.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0-lo.so.0,src/lib/.libs/librevenge-0.0-lo.so.0.0.$(REVENGE_VERSION_MICRO))) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk new file mode 100644 index 000000000..7c3e36761 --- /dev/null +++ b/external/librevenge/ExternalProject_librevenge.mk @@ -0,0 +1,50 @@ +# -*- 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,librevenge)) + +$(eval $(call gb_ExternalProject_use_autoconf,librevenge,build)) + +$(eval $(call gb_ExternalProject_register_targets,librevenge,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,librevenge,\ + boost_headers \ +)) + +$(call gb_ExternalProject_get_state_target,librevenge,build) : + $(call gb_Trace_StartRange,librevenge,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && ./configure \ + --with-pic \ + $(if $(DISABLE_DYNLOADING), \ + --disable-shared --enable-static, \ + --enable-shared --disable-static) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-werror \ + --disable-weffc \ + --disable-streams \ + --disable-generators \ + --without-docs \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/lib/.libs/librevenge-0.0.0.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,librevenge,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/librevenge/Library_revenge.mk b/external/librevenge/Library_revenge.mk new file mode 100644 index 000000000..4250e4e57 --- /dev/null +++ b/external/librevenge/Library_revenge.mk @@ -0,0 +1,48 @@ +# -*- 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_Library_Library,revenge)) + +$(eval $(call gb_Library_use_unpacked,revenge,librevenge)) + +$(eval $(call gb_Library_use_externals,revenge,\ + boost_headers \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,revenge)) + +$(eval $(call gb_Library_set_include,revenge,\ + -I$(call gb_UnpackedTarball_get_dir,librevenge)/inc \ + $$(INCLUDE) \ +)) + +# -DLIBREVENGE_STREAM_BUILD is present so that linker does not complain +# about unresolved external symbol RVNGStream::~RVNGStream +$(eval $(call gb_Library_add_defs,revenge,\ + -DBOOST_ALL_NO_LIB \ + -DDLL_EXPORT \ + -DLIBREVENGE_BUILD \ + -DLIBREVENGE_STREAM_BUILD \ + -DNDEBUG \ +)) + +$(eval $(call gb_Library_set_generated_cxx_suffix,revenge,cpp)) + +$(eval $(call gb_Library_add_generated_exception_objects,revenge,\ + UnpackedTarball/librevenge/src/lib/RVNGBinaryData \ + UnpackedTarball/librevenge/src/lib/RVNGMemoryStream \ + UnpackedTarball/librevenge/src/lib/RVNGProperty \ + UnpackedTarball/librevenge/src/lib/RVNGPropertyList \ + UnpackedTarball/librevenge/src/lib/RVNGPropertyListVector \ + UnpackedTarball/librevenge/src/lib/RVNGString \ + UnpackedTarball/librevenge/src/lib/RVNGStringVector \ + UnpackedTarball/librevenge/src/lib/RVNGSVGDrawingGenerator \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/librevenge/Makefile b/external/librevenge/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/librevenge/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/librevenge/Module_librevenge.mk b/external/librevenge/Module_librevenge.mk new file mode 100644 index 000000000..cd11805f0 --- /dev/null +++ b/external/librevenge/Module_librevenge.mk @@ -0,0 +1,31 @@ +# -*- 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,librevenge)) + +$(eval $(call gb_Module_add_targets,librevenge,\ + UnpackedTarball_librevenge \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,librevenge,\ + Library_revenge \ +)) + +else + +$(eval $(call gb_Module_add_targets,librevenge,\ + ExternalPackage_librevenge \ + ExternalProject_librevenge \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/librevenge/README b/external/librevenge/README new file mode 100644 index 000000000..23007ff99 --- /dev/null +++ b/external/librevenge/README @@ -0,0 +1,3 @@ +From [http://sourceforge.net/p/libwpd/wiki/librevenge/]. A base library +for writing document import filters. It has interfaces for text documents, +vector graphics, spreadsheets and presentations. diff --git a/external/librevenge/UnpackedTarball_librevenge.mk b/external/librevenge/UnpackedTarball_librevenge.mk new file mode 100644 index 000000000..74f28751c --- /dev/null +++ b/external/librevenge/UnpackedTarball_librevenge.mk @@ -0,0 +1,30 @@ +# -*- 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,librevenge)) + +$(eval $(call gb_UnpackedTarball_set_tarball,librevenge,$(REVENGE_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,librevenge)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,librevenge,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,librevenge, \ + external/librevenge/rpath.patch \ +)) + +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,librevenge, \ + external/librevenge/librevenge-bundled-soname.patch.0 \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/librevenge/librevenge-bundled-soname.patch.0 b/external/librevenge/librevenge-bundled-soname.patch.0 new file mode 100644 index 000000000..d98630f0c --- /dev/null +++ b/external/librevenge/librevenge-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-07 11:57:42.256742305 +0200 ++++ src/lib/Makefile.in 2015-08-07 11:58:11.818741799 +0200 +@@ -470,7 +470,7 @@ + $(am__append_2) + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LIBADD = @LIBREVENGE_WIN32_RESOURCE@ + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_DEPENDENCIES = @LIBREVENGE_WIN32_RESOURCE@ +-librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) ++librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) -release lo + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_SOURCES = \ + RVNGBinaryData.cpp \ + RVNGMemoryStream.cpp \ diff --git a/external/librevenge/rpath.patch b/external/librevenge/rpath.patch new file mode 100644 index 000000000..c7d210080 --- /dev/null +++ b/external/librevenge/rpath.patch @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -14983,6 +14983,8 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= ++runpath_var= + ;; + + lynxos*) diff --git a/external/libstaroffice/ExternalPackage_libstaroffice.mk b/external/libstaroffice/ExternalPackage_libstaroffice.mk new file mode 100644 index 000000000..939fbbc2c --- /dev/null +++ b/external/libstaroffice/ExternalPackage_libstaroffice.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,libstaroffice,libstaroffice)) + +$(eval $(call gb_ExternalPackage_use_external_project,libstaroffice,libstaroffice)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,libstaroffice,$(LIBO_LIB_FOLDER)/libstaroffice-0.0.0.dylib,src/lib/.libs/libstaroffice-0.0.0.dylib)) +else ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,libstaroffice,$(LIBO_LIB_FOLDER)/libstaroffice-0.0.dll,src/lib/.libs/libstaroffice-0.0.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,libstaroffice,$(LIBO_LIB_FOLDER)/libstaroffice-0.0-lo.so.0,src/lib/.libs/libstaroffice-0.0-lo.so.0.0.$(STAROFFICE_VERSION_MICRO))) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libstaroffice/ExternalProject_libstaroffice.mk b/external/libstaroffice/ExternalProject_libstaroffice.mk new file mode 100644 index 000000000..8aad471e5 --- /dev/null +++ b/external/libstaroffice/ExternalProject_libstaroffice.mk @@ -0,0 +1,54 @@ +# -*- 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,libstaroffice)) + +$(eval $(call gb_ExternalProject_use_autoconf,libstaroffice,build)) + +$(eval $(call gb_ExternalProject_register_targets,libstaroffice,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libstaroffice,\ + revenge \ +)) + +$(call gb_ExternalProject_get_state_target,libstaroffice,build) : + $(call gb_Trace_StartRange,libstaroffice,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && ./configure \ + --with-pic \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + --with-sharedptr=c++11 \ + --without-docs \ + --disable-tools \ + --disable-zip \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + --disable-werror \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/lib/.libs/libstaroffice-0.0.0.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,libstaroffice,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk new file mode 100644 index 000000000..66b35501d --- /dev/null +++ b/external/libstaroffice/Library_staroffice.mk @@ -0,0 +1,114 @@ +# -*- 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_Library_Library,staroffice)) + +$(eval $(call gb_Library_use_unpacked,staroffice,libstaroffice)) + +$(eval $(call gb_Library_use_externals,staroffice,\ + revenge \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,staroffice)) + +$(eval $(call gb_Library_set_precompiled_header,staroffice,external/libstaroffice/inc/pch/precompiled_staroffice)) + +$(eval $(call gb_Library_set_include,staroffice,\ + -I$(call gb_UnpackedTarball_get_dir,libstaroffice)/inc \ + -I$(call gb_UnpackedTarball_get_dir,libstaroffice)/src/lib \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,staroffice,\ + -DBUILD_STOFF \ + -D_WINDLL \ + -DNDEBUG \ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,staroffice,\ + UnpackedTarball/libstaroffice/src/lib/SDAParser \ + UnpackedTarball/libstaroffice/src/lib/SDCParser \ + UnpackedTarball/libstaroffice/src/lib/SDGParser \ + UnpackedTarball/libstaroffice/src/lib/SDWParser \ + UnpackedTarball/libstaroffice/src/lib/SDXParser \ + UnpackedTarball/libstaroffice/src/lib/STOFFCell \ + UnpackedTarball/libstaroffice/src/lib/STOFFCellStyle \ + UnpackedTarball/libstaroffice/src/lib/STOFFChart \ + UnpackedTarball/libstaroffice/src/lib/STOFFDebug \ + UnpackedTarball/libstaroffice/src/lib/STOFFDocument \ + UnpackedTarball/libstaroffice/src/lib/STOFFEntry \ + UnpackedTarball/libstaroffice/src/lib/STOFFFont \ + UnpackedTarball/libstaroffice/src/lib/STOFFFrameStyle \ + UnpackedTarball/libstaroffice/src/lib/STOFFGraphicDecoder \ + UnpackedTarball/libstaroffice/src/lib/STOFFGraphicEncoder \ + UnpackedTarball/libstaroffice/src/lib/STOFFGraphicListener \ + UnpackedTarball/libstaroffice/src/lib/STOFFGraphicShape \ + UnpackedTarball/libstaroffice/src/lib/STOFFGraphicStyle \ + UnpackedTarball/libstaroffice/src/lib/STOFFHeader \ + UnpackedTarball/libstaroffice/src/lib/STOFFInputStream \ + UnpackedTarball/libstaroffice/src/lib/STOFFList \ + UnpackedTarball/libstaroffice/src/lib/STOFFListener \ + UnpackedTarball/libstaroffice/src/lib/STOFFOLEParser \ + UnpackedTarball/libstaroffice/src/lib/STOFFPageSpan \ + UnpackedTarball/libstaroffice/src/lib/STOFFParagraph \ + UnpackedTarball/libstaroffice/src/lib/STOFFParser \ + UnpackedTarball/libstaroffice/src/lib/STOFFPosition \ + UnpackedTarball/libstaroffice/src/lib/STOFFPropertyHandler \ + UnpackedTarball/libstaroffice/src/lib/STOFFSection \ + UnpackedTarball/libstaroffice/src/lib/STOFFSpreadsheetDecoder \ + UnpackedTarball/libstaroffice/src/lib/STOFFSpreadsheetEncoder \ + UnpackedTarball/libstaroffice/src/lib/STOFFSpreadsheetListener \ + UnpackedTarball/libstaroffice/src/lib/STOFFStarMathToMMLConverter \ + UnpackedTarball/libstaroffice/src/lib/STOFFStringStream \ + UnpackedTarball/libstaroffice/src/lib/STOFFSubDocument \ + UnpackedTarball/libstaroffice/src/lib/STOFFTable \ + UnpackedTarball/libstaroffice/src/lib/STOFFTextListener \ + UnpackedTarball/libstaroffice/src/lib/SWFieldManager \ + UnpackedTarball/libstaroffice/src/lib/StarAttribute \ + UnpackedTarball/libstaroffice/src/lib/StarBitmap \ + UnpackedTarball/libstaroffice/src/lib/StarCellAttribute \ + UnpackedTarball/libstaroffice/src/lib/StarCellFormula \ + UnpackedTarball/libstaroffice/src/lib/StarCharAttribute \ + UnpackedTarball/libstaroffice/src/lib/StarEncoding \ + UnpackedTarball/libstaroffice/src/lib/StarEncodingChinese \ + UnpackedTarball/libstaroffice/src/lib/StarEncodingJapanese \ + UnpackedTarball/libstaroffice/src/lib/StarEncodingKorean \ + UnpackedTarball/libstaroffice/src/lib/StarEncodingOtherKorean \ + UnpackedTarball/libstaroffice/src/lib/StarEncodingTradChinese \ + UnpackedTarball/libstaroffice/src/lib/StarEncryption \ + UnpackedTarball/libstaroffice/src/lib/StarFileManager \ + UnpackedTarball/libstaroffice/src/lib/StarFormatManager \ + UnpackedTarball/libstaroffice/src/lib/StarFrameAttribute \ + UnpackedTarball/libstaroffice/src/lib/StarGraphicAttribute \ + UnpackedTarball/libstaroffice/src/lib/StarGraphicStruct \ + UnpackedTarball/libstaroffice/src/lib/StarItem \ + UnpackedTarball/libstaroffice/src/lib/StarItemPool \ + UnpackedTarball/libstaroffice/src/lib/StarLanguage \ + UnpackedTarball/libstaroffice/src/lib/StarLayout \ + UnpackedTarball/libstaroffice/src/lib/StarObject \ + UnpackedTarball/libstaroffice/src/lib/StarObjectChart \ + UnpackedTarball/libstaroffice/src/lib/StarObjectDraw \ + UnpackedTarball/libstaroffice/src/lib/StarObjectMath \ + UnpackedTarball/libstaroffice/src/lib/StarObjectModel \ + UnpackedTarball/libstaroffice/src/lib/StarObjectNumericRuler \ + UnpackedTarball/libstaroffice/src/lib/StarObjectPageStyle \ + UnpackedTarball/libstaroffice/src/lib/StarObjectSmallGraphic \ + UnpackedTarball/libstaroffice/src/lib/StarObjectSmallText \ + UnpackedTarball/libstaroffice/src/lib/StarObjectSpreadsheet \ + UnpackedTarball/libstaroffice/src/lib/StarObjectText \ + UnpackedTarball/libstaroffice/src/lib/StarPageAttribute \ + UnpackedTarball/libstaroffice/src/lib/StarParagraphAttribute \ + UnpackedTarball/libstaroffice/src/lib/StarState \ + UnpackedTarball/libstaroffice/src/lib/StarTable \ + UnpackedTarball/libstaroffice/src/lib/StarWriterStruct \ + UnpackedTarball/libstaroffice/src/lib/StarZone \ + UnpackedTarball/libstaroffice/src/lib/libstaroffice_internal \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libstaroffice/Makefile b/external/libstaroffice/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libstaroffice/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/libstaroffice/Module_libstaroffice.mk b/external/libstaroffice/Module_libstaroffice.mk new file mode 100644 index 000000000..b96bde2b1 --- /dev/null +++ b/external/libstaroffice/Module_libstaroffice.mk @@ -0,0 +1,31 @@ +# -*- 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,libstaroffice)) + +$(eval $(call gb_Module_add_targets,libstaroffice,\ + UnpackedTarball_libstaroffice \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,libstaroffice,\ + Library_staroffice \ +)) + +else + +$(eval $(call gb_Module_add_targets,libstaroffice,\ + ExternalPackage_libstaroffice \ + ExternalProject_libstaroffice \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libstaroffice/README b/external/libstaroffice/README new file mode 100644 index 000000000..957fb4926 --- /dev/null +++ b/external/libstaroffice/README @@ -0,0 +1,3 @@ +Library parsing different document file formats of StarOffice. + +https://github.com/fosnola/libstaroffice diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk new file mode 100644 index 000000000..b7d8f4ee7 --- /dev/null +++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk @@ -0,0 +1,32 @@ +# -*- 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,libstaroffice)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libstaroffice,$(STAROFFICE_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libstaroffice,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libstaroffice)) + +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ + external/libstaroffice/libstaroffice-bundled-soname.patch.0 \ +)) +endif +endif + +ifeq ($(SYSTEM_REVENGE),) +$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ + external/libstaroffice/rpath.patch \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libstaroffice/inc/pch/precompiled_staroffice.cxx b/external/libstaroffice/inc/pch/precompiled_staroffice.cxx new file mode 100644 index 000000000..5e5bfdb72 --- /dev/null +++ b/external/libstaroffice/inc/pch/precompiled_staroffice.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_staroffice.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libstaroffice/inc/pch/precompiled_staroffice.hxx b/external/libstaroffice/inc/pch/precompiled_staroffice.hxx new file mode 100644 index 000000000..1ad24c005 --- /dev/null +++ b/external/libstaroffice/inc/pch/precompiled_staroffice.hxx @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2019-10-13 10:27:57 using: + ./bin/update_pch external/libstaroffice staroffice --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/libstaroffice/inc/pch/precompiled_staroffice.hxx "make external/libstaroffice.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <algorithm> +#include <cctype> +#include <cmath> +#include <cstdarg> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctype.h> +#include <functional> +#include <iomanip> +#include <iostream> +#include <limits> +#include <locale.h> +#include <map> +#include <math.h> +#include <memory> +#include <set> +#include <sstream> +#include <stack> +#include <string.h> +#include <string> +#include <time.h> +#include <utility> +#include <vector> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <librevenge-stream/librevenge-stream.h> +#include <librevenge/librevenge.h> +#include <libstaroffice/libstaroffice.hxx> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libstaroffice/libstaroffice-bundled-soname.patch.0 b/external/libstaroffice/libstaroffice-bundled-soname.patch.0 new file mode 100644 index 000000000..00b064d10 --- /dev/null +++ b/external/libstaroffice/libstaroffice-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-07 14:04:47.646611627 +0200 ++++ src/lib/Makefile.in 2015-08-07 14:25:49.888589996 +0200 +@@ -418,7 +418,7 @@ + AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) $(ZLIB_CFLAGS) -DBUILD_STAROFFICE=1 + libstaroffice_@STAROFFICE_MAJOR_VERSION@_@STAROFFICE_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(ZLIB_LIBS) @LIBSTAROFFICE_WIN32_RESOURCE@ + libstaroffice_@STAROFFICE_MAJOR_VERSION@_@STAROFFICE_MINOR_VERSION@_la_DEPENDENCIES = @LIBSTAROFFICE_WIN32_RESOURCE@ +-libstaroffice_@STAROFFICE_MAJOR_VERSION@_@STAROFFICE_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libstaroffice_@STAROFFICE_MAJOR_VERSION@_@STAROFFICE_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libstaroffice_@STAROFFICE_MAJOR_VERSION@_@STAROFFICE_MINOR_VERSION@_la_SOURCES = \ + SDAParser.cxx \ + SDAParser.hxx \ diff --git a/external/libstaroffice/rpath.patch b/external/libstaroffice/rpath.patch new file mode 100644 index 000000000..a73d8ae22 --- /dev/null +++ b/external/libstaroffice/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -15353,6 +15353,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) diff --git a/external/libtommath/ExternalProject_libtommath.mk b/external/libtommath/ExternalProject_libtommath.mk new file mode 100644 index 000000000..ba2089eb8 --- /dev/null +++ b/external/libtommath/ExternalProject_libtommath.mk @@ -0,0 +1,38 @@ +# -*- 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,libtommath)) + +$(eval $(call gb_ExternalProject_register_targets,libtommath,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_nmake,libtommath,build)) + +ifeq ($(COM),MSC) +$(call gb_ExternalProject_get_state_target,libtommath,build): + $(call gb_Trace_StartRange,libtommath,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + nmake -nologo -f makefile.msvc \ + ) + $(call gb_Trace_EndRange,libtommath,EXTERNAL) +else +$(call gb_ExternalProject_get_state_target,libtommath,build) : + $(call gb_Trace_StartRange,libtommath,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + unset MAKEFLAGS \ + && export CFLAGS=" \ + -fPIC \ + " \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libtommath,EXTERNAL) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libtommath/Makefile b/external/libtommath/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libtommath/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/libtommath/Module_libtommath.mk b/external/libtommath/Module_libtommath.mk new file mode 100644 index 000000000..def67f839 --- /dev/null +++ b/external/libtommath/Module_libtommath.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,libtommath)) + +$(eval $(call gb_Module_add_targets,libtommath,\ + ExternalProject_libtommath \ + UnpackedTarball_libtommath \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libtommath/README b/external/libtommath/README new file mode 100644 index 000000000..0da3128c5 --- /dev/null +++ b/external/libtommath/README @@ -0,0 +1,6 @@ +LibTomMath is a free open source portable number theoretic multiple-precision +integer library written entirely in C. + +Used by embedded firebird (external/firebird). + +http://www.libtom.org/LibTomMath/ diff --git a/external/libtommath/UnpackedTarball_libtommath.mk b/external/libtommath/UnpackedTarball_libtommath.mk new file mode 100644 index 000000000..bb0b9e352 --- /dev/null +++ b/external/libtommath/UnpackedTarball_libtommath.mk @@ -0,0 +1,21 @@ +# -*- 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,libtommath)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libtommath,$(LIBTOMMATH_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libtommath,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,libtommath,\ + external/libtommath/libtommath-msvc.patch \ + external/libtommath/clang-cl.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libtommath/clang-cl.patch b/external/libtommath/clang-cl.patch new file mode 100644 index 000000000..1cc92d380 --- /dev/null +++ b/external/libtommath/clang-cl.patch @@ -0,0 +1,16 @@ +--- tommath.h ++++ tommath.h +@@ -15,6 +15,13 @@ + #ifndef BN_H_
+ #define BN_H_
+
++// Work around clang-cl issue when mp_word is a typedef for unsigned __int128, see ++// <https://bugs.llvm.org/show_bug.cgi?id=25305> "Clang-cl generates a call to an undefined symbol ++// _udivti3": ++#if defined _WIN32 && defined __clang__ ++#define MP_8BIT ++#endif ++ + #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdint.h>
diff --git a/external/libtommath/libtommath-msvc.patch b/external/libtommath/libtommath-msvc.patch new file mode 100644 index 000000000..07884871a --- /dev/null +++ b/external/libtommath/libtommath-msvc.patch @@ -0,0 +1,12 @@ +--- makefile.msvc 2016-02-05 23:25:32.000000000 +0100 ++++ makefile.msvc 2016-07-21 11:34:20.618390100 +0200 +@@ -38,3 +38,9 @@ +
+ library: $(OBJECTS)
+ lib /out:tommath.lib $(OBJECTS)
++
++.cc.obj:
++ $(CC) /nologo $(CFLAGS) /c $<
++
++.c.obj:
++ $(CC) /nologo $(CFLAGS) /c $<
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk new file mode 100644 index 000000000..0911fcd87 --- /dev/null +++ b/external/libvisio/ExternalProject_libvisio.mk @@ -0,0 +1,47 @@ +# -*- 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,libvisio)) + +$(eval $(call gb_ExternalProject_use_autoconf,libvisio,build)) + +$(eval $(call gb_ExternalProject_register_targets,libvisio,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libvisio,\ + boost_headers \ + icu \ + libxml2 \ + revenge \ +)) + +$(call gb_ExternalProject_get_state_target,libvisio,build) : + $(call gb_Trace_StartRange,libvisio,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-tests \ + --disable-tools \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-werror \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(gb_FULLDEPS),,--disable-dependency-tracking) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libvisio,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libvisio/Makefile b/external/libvisio/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libvisio/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/libvisio/Module_libvisio.mk b/external/libvisio/Module_libvisio.mk new file mode 100644 index 000000000..00b05d25d --- /dev/null +++ b/external/libvisio/Module_libvisio.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,libvisio)) + +$(eval $(call gb_Module_add_targets,libvisio,\ + ExternalProject_libvisio \ + UnpackedTarball_libvisio \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libvisio/README b/external/libvisio/README new file mode 100644 index 000000000..d3ddc6c9b --- /dev/null +++ b/external/libvisio/README @@ -0,0 +1,3 @@ +Libvisio is library providing ability to interpret and import visio diagrams into various applications. + +[https://wiki.documentfoundation.org/DLP/Libraries/libvisio] diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk new file mode 100644 index 000000000..e19878740 --- /dev/null +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -0,0 +1,22 @@ +# -*- 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,libvisio)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libvisio)) + +$(eval $(call gb_UnpackedTarball_add_patches,libvisio, \ + external/libvisio/ubsan.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libvisio/ubsan.patch b/external/libvisio/ubsan.patch new file mode 100644 index 000000000..c9ffbd98f --- /dev/null +++ b/external/libvisio/ubsan.patch @@ -0,0 +1,11 @@ +--- src/lib/VSDContentCollector.cpp ++++ src/lib/VSDContentCollector.cpp +@@ -3220,7 +3220,7 @@ + } + if (U_SUCCESS(status) && conv) + { +- const auto *src = (const char *)&characters[0]; ++ const auto *src = (const char *)characters.data(); + const char *srcLimit = (const char *)src + characters.size(); + while (src < srcLimit) + { diff --git a/external/libwpd/ExternalPackage_libwpd.mk b/external/libwpd/ExternalPackage_libwpd.mk new file mode 100644 index 000000000..cc1ebb4da --- /dev/null +++ b/external/libwpd/ExternalPackage_libwpd.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,libwpd,libwpd)) + +$(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.10.dylib,src/lib/.libs/libwpd-0.10.10.dylib)) +else ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.dll,src/lib/.libs/libwpd-0.10.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10-lo.so.10,src/lib/.libs/libwpd-0.10-lo.so.10.0.$(WPD_VERSION_MICRO))) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk new file mode 100644 index 000000000..c3b810c6a --- /dev/null +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -0,0 +1,53 @@ +# -*- 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,libwpd)) + +$(eval $(call gb_ExternalProject_use_autoconf,libwpd,build)) + +$(eval $(call gb_ExternalProject_register_targets,libwpd,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libwpd,\ + boost_headers \ + revenge \ +)) + +$(call gb_ExternalProject_get_state_target,libwpd,build) : + $(call gb_Trace_StartRange,libwpd,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + $(if $(DISABLE_DYNLOADING), \ + --disable-shared --enable-static, \ + --enable-shared --disable-static) \ + --without-docs \ + --disable-tools \ + --disable-debug \ + --disable-werror \ + $(if $(filter MACOSX,$(OS)), \ + --prefix=/@.__________________________________________________OOO) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/lib/.libs/libwpd-0.10.10.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,libwpd,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libwpd/Library_wpd.mk b/external/libwpd/Library_wpd.mk new file mode 100644 index 000000000..6b14f424d --- /dev/null +++ b/external/libwpd/Library_wpd.mk @@ -0,0 +1,211 @@ +# -*- 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_Library_Library,wpd)) + +$(eval $(call gb_Library_use_unpacked,wpd,libwpd)) + +$(eval $(call gb_Library_use_externals,wpd,\ + boost_headers \ + revenge \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,wpd)) + +$(eval $(call gb_Library_set_include,wpd,\ + -I$(call gb_UnpackedTarball_get_dir,libwpd)/inc \ + -I$(call gb_UnpackedTarball_get_dir,libwpd)/src/lib \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_set_precompiled_header,wpd,external/libwpd/inc/pch/precompiled_wpd)) + +$(eval $(call gb_Library_add_defs,wpd,\ + -DBOOST_ALL_NO_LIB \ + -DDLL_EXPORT \ + -DLIBWPD_BUILD \ + -DNDEBUG \ +)) + +$(eval $(call gb_Library_set_generated_cxx_suffix,wpd,cpp)) + +$(eval $(call gb_Library_add_generated_exception_objects,wpd,\ + UnpackedTarball/libwpd/src/lib/WP1BottomMarginGroup \ + UnpackedTarball/libwpd/src/lib/WP1CenterTextGroup \ + UnpackedTarball/libwpd/src/lib/WP1ContentListener \ + UnpackedTarball/libwpd/src/lib/WP1ExtendedCharacterGroup \ + UnpackedTarball/libwpd/src/lib/WP1FileStructure \ + UnpackedTarball/libwpd/src/lib/WP1FixedLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP1FlushRightGroup \ + UnpackedTarball/libwpd/src/lib/WP1FontIdGroup \ + UnpackedTarball/libwpd/src/lib/WP1FootnoteEndnoteGroup \ + UnpackedTarball/libwpd/src/lib/WP1HeaderFooterGroup \ + UnpackedTarball/libwpd/src/lib/WP1Heuristics \ + UnpackedTarball/libwpd/src/lib/WP1JustificationGroup \ + UnpackedTarball/libwpd/src/lib/WP1LeftIndentGroup \ + UnpackedTarball/libwpd/src/lib/WP1LeftRightIndentGroup \ + UnpackedTarball/libwpd/src/lib/WP1Listener \ + UnpackedTarball/libwpd/src/lib/WP1MarginReleaseGroup \ + UnpackedTarball/libwpd/src/lib/WP1MarginResetGroup \ + UnpackedTarball/libwpd/src/lib/WP1Parser \ + UnpackedTarball/libwpd/src/lib/WP1Part \ + UnpackedTarball/libwpd/src/lib/WP1PictureGroup \ + UnpackedTarball/libwpd/src/lib/WP1PointSizeGroup \ + UnpackedTarball/libwpd/src/lib/WP1SetTabsGroup \ + UnpackedTarball/libwpd/src/lib/WP1SpacingResetGroup \ + UnpackedTarball/libwpd/src/lib/WP1StylesListener \ + UnpackedTarball/libwpd/src/lib/WP1SubDocument \ + UnpackedTarball/libwpd/src/lib/WP1SuppressPageCharacteristicsGroup \ + UnpackedTarball/libwpd/src/lib/WP1TopMarginGroup \ + UnpackedTarball/libwpd/src/lib/WP1UnsupportedFixedLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP1UnsupportedVariableLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP1VariableLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP3AttributeGroup \ + UnpackedTarball/libwpd/src/lib/WP3ContentListener \ + UnpackedTarball/libwpd/src/lib/WP3DefinitionGroup \ + UnpackedTarball/libwpd/src/lib/WP3DisplayGroup \ + UnpackedTarball/libwpd/src/lib/WP3DoubleByteScriptCharacterGroup \ + UnpackedTarball/libwpd/src/lib/WP3EndOfLinePageGroup \ + UnpackedTarball/libwpd/src/lib/WP3ExtendedCharacterGroup \ + UnpackedTarball/libwpd/src/lib/WP3FileStructure \ + UnpackedTarball/libwpd/src/lib/WP3FixedLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP3FontGroup \ + UnpackedTarball/libwpd/src/lib/WP3FootnoteEndnoteGroup \ + UnpackedTarball/libwpd/src/lib/WP3Header \ + UnpackedTarball/libwpd/src/lib/WP3HeaderFooterGroup \ + UnpackedTarball/libwpd/src/lib/WP3IndentGroup \ + UnpackedTarball/libwpd/src/lib/WP3Listener \ + UnpackedTarball/libwpd/src/lib/WP3MiscellaneousGroup \ + UnpackedTarball/libwpd/src/lib/WP3PageFormatGroup \ + UnpackedTarball/libwpd/src/lib/WP3Parser \ + UnpackedTarball/libwpd/src/lib/WP3Part \ + UnpackedTarball/libwpd/src/lib/WP3Resource \ + UnpackedTarball/libwpd/src/lib/WP3ResourceFork \ + UnpackedTarball/libwpd/src/lib/WP3SingleByteFunction \ + UnpackedTarball/libwpd/src/lib/WP3StylesListener \ + UnpackedTarball/libwpd/src/lib/WP3SubDocument \ + UnpackedTarball/libwpd/src/lib/WP3TabGroup \ + UnpackedTarball/libwpd/src/lib/WP3TablesGroup \ + UnpackedTarball/libwpd/src/lib/WP3UndoGroup \ + UnpackedTarball/libwpd/src/lib/WP3UnsupportedFixedLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP3UnsupportedVariableLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP3VariableLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP3WindowGroup \ + UnpackedTarball/libwpd/src/lib/WP42ContentListener \ + UnpackedTarball/libwpd/src/lib/WP42DefineColumnsGroup \ + UnpackedTarball/libwpd/src/lib/WP42ExtendedCharacterGroup \ + UnpackedTarball/libwpd/src/lib/WP42FileStructure \ + UnpackedTarball/libwpd/src/lib/WP42HeaderFooterGroup \ + UnpackedTarball/libwpd/src/lib/WP42Heuristics \ + UnpackedTarball/libwpd/src/lib/WP42Listener \ + UnpackedTarball/libwpd/src/lib/WP42MarginResetGroup \ + UnpackedTarball/libwpd/src/lib/WP42MultiByteFunctionGroup \ + UnpackedTarball/libwpd/src/lib/WP42Parser \ + UnpackedTarball/libwpd/src/lib/WP42Part \ + UnpackedTarball/libwpd/src/lib/WP42StylesListener \ + UnpackedTarball/libwpd/src/lib/WP42SubDocument \ + UnpackedTarball/libwpd/src/lib/WP42SuppressPageCharacteristicsGroup \ + UnpackedTarball/libwpd/src/lib/WP42UnsupportedMultiByteFunctionGroup \ + UnpackedTarball/libwpd/src/lib/WP5AttributeGroup \ + UnpackedTarball/libwpd/src/lib/WP5BoxGroup \ + UnpackedTarball/libwpd/src/lib/WP5ContentListener \ + UnpackedTarball/libwpd/src/lib/WP5DefinitionGroup \ + UnpackedTarball/libwpd/src/lib/WP5ExtendedCharacterGroup \ + UnpackedTarball/libwpd/src/lib/WP5FileStructure \ + UnpackedTarball/libwpd/src/lib/WP5FixedLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP5FontGroup \ + UnpackedTarball/libwpd/src/lib/WP5FontNameStringPoolPacket \ + UnpackedTarball/libwpd/src/lib/WP5FootnoteEndnoteGroup \ + UnpackedTarball/libwpd/src/lib/WP5GeneralPacketData \ + UnpackedTarball/libwpd/src/lib/WP5GeneralPacketIndex \ + UnpackedTarball/libwpd/src/lib/WP5GraphicsInformationPacket \ + UnpackedTarball/libwpd/src/lib/WP5Header \ + UnpackedTarball/libwpd/src/lib/WP5HeaderFooterGroup \ + UnpackedTarball/libwpd/src/lib/WP5IndentGroup \ + UnpackedTarball/libwpd/src/lib/WP5ListFontsUsedPacket \ + UnpackedTarball/libwpd/src/lib/WP5Listener \ + UnpackedTarball/libwpd/src/lib/WP5PageFormatGroup \ + UnpackedTarball/libwpd/src/lib/WP5Parser \ + UnpackedTarball/libwpd/src/lib/WP5Part \ + UnpackedTarball/libwpd/src/lib/WP5PrefixData \ + UnpackedTarball/libwpd/src/lib/WP5SingleByteFunction \ + UnpackedTarball/libwpd/src/lib/WP5SpecialHeaderIndex \ + UnpackedTarball/libwpd/src/lib/WP5StylesListener \ + UnpackedTarball/libwpd/src/lib/WP5SubDocument \ + UnpackedTarball/libwpd/src/lib/WP5TabGroup \ + UnpackedTarball/libwpd/src/lib/WP5TableEOLGroup \ + UnpackedTarball/libwpd/src/lib/WP5TableEOPGroup \ + UnpackedTarball/libwpd/src/lib/WP5UnsupportedFixedLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP5UnsupportedVariableLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP5VariableLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP60Header \ + UnpackedTarball/libwpd/src/lib/WP61Header \ + UnpackedTarball/libwpd/src/lib/WP6AttributeGroup \ + UnpackedTarball/libwpd/src/lib/WP6BoxGroup \ + UnpackedTarball/libwpd/src/lib/WP6CharacterGroup \ + UnpackedTarball/libwpd/src/lib/WP6ColumnGroup \ + UnpackedTarball/libwpd/src/lib/WP6CommentAnnotationPacket \ + UnpackedTarball/libwpd/src/lib/WP6ContentListener \ + UnpackedTarball/libwpd/src/lib/WP6DefaultInitialFontPacket \ + UnpackedTarball/libwpd/src/lib/WP6DisplayNumberReferenceGroup \ + UnpackedTarball/libwpd/src/lib/WP6EOLGroup \ + UnpackedTarball/libwpd/src/lib/WP6ExtendedCharacterGroup \ + UnpackedTarball/libwpd/src/lib/WP6ExtendedDocumentSummaryPacket \ + UnpackedTarball/libwpd/src/lib/WP6FileStructure \ + UnpackedTarball/libwpd/src/lib/WP6FillStylePacket \ + UnpackedTarball/libwpd/src/lib/WP6FixedLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP6FontDescriptorPacket \ + UnpackedTarball/libwpd/src/lib/WP6FootnoteEndnoteGroup \ + UnpackedTarball/libwpd/src/lib/WP6GeneralTextPacket \ + UnpackedTarball/libwpd/src/lib/WP6GraphicsBoxStylePacket \ + UnpackedTarball/libwpd/src/lib/WP6GraphicsCachedFileDataPacket \ + UnpackedTarball/libwpd/src/lib/WP6GraphicsFilenamePacket \ + UnpackedTarball/libwpd/src/lib/WP6Header \ + UnpackedTarball/libwpd/src/lib/WP6HeaderFooterGroup \ + UnpackedTarball/libwpd/src/lib/WP6HighlightGroup \ + UnpackedTarball/libwpd/src/lib/WP6HyperlinkPacket \ + UnpackedTarball/libwpd/src/lib/WP6Listener \ + UnpackedTarball/libwpd/src/lib/WP6NumberingMethodGroup \ + UnpackedTarball/libwpd/src/lib/WP6OutlineStylePacket \ + UnpackedTarball/libwpd/src/lib/WP6PageGroup \ + UnpackedTarball/libwpd/src/lib/WP6ParagraphGroup \ + UnpackedTarball/libwpd/src/lib/WP6Parser \ + UnpackedTarball/libwpd/src/lib/WP6Part \ + UnpackedTarball/libwpd/src/lib/WP6PrefixData \ + UnpackedTarball/libwpd/src/lib/WP6PrefixDataPacket \ + UnpackedTarball/libwpd/src/lib/WP6PrefixIndice \ + UnpackedTarball/libwpd/src/lib/WP6SetNumberGroup \ + UnpackedTarball/libwpd/src/lib/WP6SingleByteFunction \ + UnpackedTarball/libwpd/src/lib/WP6StyleGroup \ + UnpackedTarball/libwpd/src/lib/WP6StylesListener \ + UnpackedTarball/libwpd/src/lib/WP6SubDocument \ + UnpackedTarball/libwpd/src/lib/WP6TabGroup \ + UnpackedTarball/libwpd/src/lib/WP6TableStylePacket \ + UnpackedTarball/libwpd/src/lib/WP6UndoGroup \ + UnpackedTarball/libwpd/src/lib/WP6UnsupportedFixedLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP6UnsupportedVariableLengthGroup \ + UnpackedTarball/libwpd/src/lib/WP6VariableLengthGroup \ + UnpackedTarball/libwpd/src/lib/WPDocument \ + UnpackedTarball/libwpd/src/lib/WPXContentListener \ + UnpackedTarball/libwpd/src/lib/WPXEncryption \ + UnpackedTarball/libwpd/src/lib/WPXHeader \ + UnpackedTarball/libwpd/src/lib/WPXHeaderFooter \ + UnpackedTarball/libwpd/src/lib/WPXListener \ + UnpackedTarball/libwpd/src/lib/WPXMemoryStream \ + UnpackedTarball/libwpd/src/lib/WPXPageSpan \ + UnpackedTarball/libwpd/src/lib/WPXParser \ + UnpackedTarball/libwpd/src/lib/WPXStylesListener \ + UnpackedTarball/libwpd/src/lib/WPXSubDocument \ + UnpackedTarball/libwpd/src/lib/WPXTable \ + UnpackedTarball/libwpd/src/lib/WPXTableList \ + UnpackedTarball/libwpd/src/lib/libwpd_internal \ + UnpackedTarball/libwpd/src/lib/libwpd_math \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libwpd/Makefile b/external/libwpd/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libwpd/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/libwpd/Module_libwpd.mk b/external/libwpd/Module_libwpd.mk new file mode 100644 index 000000000..db916a582 --- /dev/null +++ b/external/libwpd/Module_libwpd.mk @@ -0,0 +1,31 @@ +# -*- 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,libwpd)) + +$(eval $(call gb_Module_add_targets,libwpd,\ + UnpackedTarball_libwpd \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,libwpd,\ + Library_wpd \ +)) + +else + +$(eval $(call gb_Module_add_targets,libwpd,\ + ExternalPackage_libwpd \ + ExternalProject_libwpd \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libwpd/README b/external/libwpd/README new file mode 100644 index 000000000..2cc9c8a18 --- /dev/null +++ b/external/libwpd/README @@ -0,0 +1 @@ +From [http://libwpd.sourceforge.net/]. Not modified. WordPerfect filter - SAX api - emits callbacks when things happen. diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk new file mode 100644 index 000000000..8d0227b93 --- /dev/null +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -0,0 +1,33 @@ +# -*- 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,libwpd)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libwpd,$(WPD_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libwpd,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwpd)) + +$(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ + external/libwpd/libwpd-vs2013.patch.1 \ + $(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \ +)) + +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +ifneq ($(OS),iOS) +$(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ + external/libwpd/libwpd-bundled-soname.patch.0 \ +)) +endif +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libwpd/inc/pch/precompiled_wpd.cxx b/external/libwpd/inc/pch/precompiled_wpd.cxx new file mode 100644 index 000000000..32c492c12 --- /dev/null +++ b/external/libwpd/inc/pch/precompiled_wpd.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_wpd.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libwpd/inc/pch/precompiled_wpd.hxx b/external/libwpd/inc/pch/precompiled_wpd.hxx new file mode 100644 index 000000000..8c62c61ec --- /dev/null +++ b/external/libwpd/inc/pch/precompiled_wpd.hxx @@ -0,0 +1,52 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2019-10-13 09:48:15 using: + ./bin/update_pch external/libwpd wpd --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/libwpd/inc/pch/precompiled_wpd.hxx "make external/libwpd.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <algorithm> +#include <assert.h> +#include <cstdarg> +#include <cstdio> +#include <ctype.h> +#include <libwpd_internal.h> +#include <libwpd_math.h> +#include <limits> +#include <locale.h> +#include <math.h> +#include <memory> +#include <set> +#include <sstream> +#include <string.h> +#include <string> +#include <time.h> +#include <vector> +#include <boost/spirit/include/qi.hpp> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <librevenge-stream/librevenge-stream.h> +#include <librevenge/librevenge.h> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libwpd/libwpd-bundled-soname.patch.0 b/external/libwpd/libwpd-bundled-soname.patch.0 new file mode 100644 index 000000000..2a669748f --- /dev/null +++ b/external/libwpd/libwpd-bundled-soname.patch.0 @@ -0,0 +1,10 @@ +--- src/lib/Makefile.in.orig 2015-08-06 21:41:41.073622494 +0200 ++++ src/lib/Makefile.in 2015-08-06 21:42:09.377622009 +0200 +@@ -429,6 +429,6 @@ + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPD_WIN32_RESOURCE@ + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPD_WIN32_RESOURCE@ +-libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) ++libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) -release lo + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_SOURCES = \ + libwpd_internal.cpp \ + libwpd_math.cpp \ diff --git a/external/libwpd/libwpd-vs2013.patch.1 b/external/libwpd/libwpd-vs2013.patch.1 new file mode 100644 index 000000000..224af4732 --- /dev/null +++ b/external/libwpd/libwpd-vs2013.patch.1 @@ -0,0 +1,25 @@ +--- libwpd/src/lib/libwpd_math.h ++++ libwpd/src/lib/libwpd_math.h +@@ -31,9 +31,9 @@ + + #include <math.h> + +-#if defined(_WIN32) && !defined(__MINGW32__) ++#if defined(_MSC_VER) && _MSC_VER < 1800 + double rint(double x); +-#endif /* _WIN32 */ ++#endif /* _MSC_VER < 1800 */ + + #endif /* LIBWPD_MATH_H */ + /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ +--- libwpd/src/lib/libwpd_math.cpp ++++ libwpd/src/lib/libwpd_math.cpp +@@ -26,7 +26,7 @@ + + #include "libwpd_math.h" + +-#if defined(_WIN32) && !defined(__MINGW32__) ++#if defined(_MSC_VER) && _MSC_VER < 1800 + + double rint(double x) + { diff --git a/external/libwpd/rpath.patch b/external/libwpd/rpath.patch new file mode 100644 index 000000000..fb3deaa81 --- /dev/null +++ b/external/libwpd/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -13850,6 +13850,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) diff --git a/external/libwpg/ExternalPackage_libwpg.mk b/external/libwpg/ExternalPackage_libwpg.mk new file mode 100644 index 000000000..c3eb05c7a --- /dev/null +++ b/external/libwpg/ExternalPackage_libwpg.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,libwpg,libwpg)) + +$(eval $(call gb_ExternalPackage_use_external_project,libwpg,libwpg)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.3.dylib,src/lib/.libs/libwpg-0.3.3.dylib)) +else ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.dll,src/lib/.libs/libwpg-0.3.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3-lo.so.3,src/lib/.libs/libwpg-0.3-lo.so.3.0.$(WPG_VERSION_MICRO))) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk new file mode 100644 index 000000000..01f31c55d --- /dev/null +++ b/external/libwpg/ExternalProject_libwpg.mk @@ -0,0 +1,51 @@ +# -*- 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,libwpg)) + +$(eval $(call gb_ExternalProject_use_autoconf,libwpg,build)) + +$(eval $(call gb_ExternalProject_register_targets,libwpg,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libwpg,\ + revenge \ + wpd \ +)) + +$(call gb_ExternalProject_get_state_target,libwpg,build) : + $(call gb_Trace_StartRange,libwpg,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./configure \ + --with-pic \ + $(if $(DISABLE_DYNLOADING), \ + --disable-shared --enable-static, \ + --enable-shared --disable-static) \ + --without-docs \ + --disable-tools \ + --disable-debug \ + --disable-werror \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + $(if $(filter LINUX,$(OS)), \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/lib/.libs/libwpg-0.3.3.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,libwpg,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libwpg/Library_wpg.mk b/external/libwpg/Library_wpg.mk new file mode 100644 index 000000000..09dc34915 --- /dev/null +++ b/external/libwpg/Library_wpg.mk @@ -0,0 +1,48 @@ +# -*- 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_Library_Library,wpg)) + +$(eval $(call gb_Library_use_unpacked,wpg,libwpg)) + +$(eval $(call gb_Library_use_externals,wpg,\ + revenge \ + wpd \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,wpg)) + +$(eval $(call gb_Library_set_include,wpg,\ + -I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,wpg,\ + -DBOOST_ALL_NO_LIB \ + -DDLL_EXPORT \ + -DLIBWPG_BUILD \ + -DNDEBUG \ +)) + +$(eval $(call gb_Library_set_generated_cxx_suffix,wpg,cpp)) + +$(eval $(call gb_Library_add_generated_exception_objects,wpg,\ + UnpackedTarball/libwpg/src/lib/WPG1Parser \ + UnpackedTarball/libwpg/src/lib/WPG2Parser \ + UnpackedTarball/libwpg/src/lib/WPGBitmap \ + UnpackedTarball/libwpg/src/lib/WPGColor \ + UnpackedTarball/libwpg/src/lib/WPGDashArray \ + UnpackedTarball/libwpg/src/lib/WPGHeader \ + UnpackedTarball/libwpg/src/lib/WPGTextDataHandler \ + UnpackedTarball/libwpg/src/lib/WPGXParser \ + UnpackedTarball/libwpg/src/lib/WPGraphics \ + UnpackedTarball/libwpg/src/lib/libwpg_utils \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libwpg/Makefile b/external/libwpg/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libwpg/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/libwpg/Module_libwpg.mk b/external/libwpg/Module_libwpg.mk new file mode 100644 index 000000000..668ae8404 --- /dev/null +++ b/external/libwpg/Module_libwpg.mk @@ -0,0 +1,31 @@ +# -*- 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,libwpg)) + +$(eval $(call gb_Module_add_targets,libwpg,\ + UnpackedTarball_libwpg \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,libwpg,\ + Library_wpg \ +)) + +else + +$(eval $(call gb_Module_add_targets,libwpg,\ + ExternalPackage_libwpg \ + ExternalProject_libwpg \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libwpg/README b/external/libwpg/README new file mode 100644 index 000000000..19a154dd4 --- /dev/null +++ b/external/libwpg/README @@ -0,0 +1 @@ +From [http://libwpg.sourceforge.net/]. WordPerfect graphics filter. diff --git a/external/libwpg/UnpackedTarball_libwpg.mk b/external/libwpg/UnpackedTarball_libwpg.mk new file mode 100644 index 000000000..9ca55c669 --- /dev/null +++ b/external/libwpg/UnpackedTarball_libwpg.mk @@ -0,0 +1,32 @@ +# -*- 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,libwpg)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libwpg,$(WPG_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libwpg,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwpg)) + +$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \ + external/libwpg/rpath.patch \ +)) + +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +ifneq ($(OS),iOS) +$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \ + external/libwpg/libwpg-bundled-soname.patch.0 \ +)) +endif +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libwpg/libwpg-bundled-soname.patch.0 b/external/libwpg/libwpg-bundled-soname.patch.0 new file mode 100644 index 000000000..282bbbb8b --- /dev/null +++ b/external/libwpg/libwpg-bundled-soname.patch.0 @@ -0,0 +1,10 @@ +--- src/lib/Makefile.in.orig 2015-08-06 21:30:41.615633795 +0200 ++++ src/lib/Makefile.in 2015-08-06 21:31:03.764633415 +0200 +@@ -357,6 +357,6 @@ + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(REVENGE_LIBS) @LIBWPG_WIN32_RESOURCE@ + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPG_WIN32_RESOURCE@ +-libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_SOURCES = \ + WPG1Parser.cpp \ + WPG1Parser.h \ diff --git a/external/libwpg/rpath.patch b/external/libwpg/rpath.patch new file mode 100644 index 000000000..5a8f56105 --- /dev/null +++ b/external/libwpg/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -13858,6 +13858,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) diff --git a/external/libwps/ExternalPackage_libwps.mk b/external/libwps/ExternalPackage_libwps.mk new file mode 100644 index 000000000..daa17c117 --- /dev/null +++ b/external/libwps/ExternalPackage_libwps.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,libwps,libwps)) + +$(eval $(call gb_ExternalPackage_use_external_project,libwps,libwps)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.4.dylib,src/lib/.libs/libwps-0.4.4.dylib)) +else ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.dll,src/lib/.libs/libwps-0.4.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4-lo.so.4,src/lib/.libs/libwps-0.4-lo.so.4.0.$(WPS_VERSION_MICRO))) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk new file mode 100644 index 000000000..a7c37aedd --- /dev/null +++ b/external/libwps/ExternalProject_libwps.mk @@ -0,0 +1,75 @@ +# -*- 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,libwps)) + +$(eval $(call gb_ExternalProject_use_autoconf,libwps,build)) + +$(eval $(call gb_ExternalProject_register_targets,libwps,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libwps,\ + revenge \ +)) + +ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS))) +ifneq (,$(gb_ENABLE_DBGUTIL)) +libwps_CPPFLAGS+=-D_GLIBCXX_DEBUG +endif +endif + +libwps_CXXFLAGS=$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) + +libwps_LDFLAGS= +ifeq ($(OS),LINUX) +ifeq ($(SYSTEM_REVENGE),) +libwps_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\$$$$ORIGIN +endif +endif + +ifeq ($(ENABLE_GDB_INDEX),TRUE) +libwps_LDFLAGS+=-Wl,--gdb-index +libwps_CXXFLAGS+=-ggnu-pubnames +ifneq ($(USE_LD),) +libwps_LDFLAGS += -fuse-ld=$(USE_LD) +endif +endif + +$(call gb_ExternalProject_get_state_target,libwps,build) : + $(call gb_Trace_StartRange,libwps,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && ./configure \ + --with-pic \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + --with-sharedptr=c++11 \ + --without-docs \ + --disable-tools \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-werror \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(libwps_CXXFLAGS),CXXFLAGS='$(libwps_CXXFLAGS)') \ + $(if $(libwps_CPPFLAGS),CPPFLAGS='$(libwps_CPPFLAGS)') \ + $(if $(libwps_LDFLAGS),LDFLAGS='$(libwps_LDFLAGS)') \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.4.4.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,libwps,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk new file mode 100644 index 000000000..349bdbe83 --- /dev/null +++ b/external/libwps/Library_wps.mk @@ -0,0 +1,101 @@ +# -*- 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_Library_Library,wps)) + +$(eval $(call gb_Library_use_unpacked,wps,libwps)) + +$(eval $(call gb_Library_use_externals,wps,\ + revenge \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,wps)) + +$(eval $(call gb_Library_set_include,wps,\ + -I$(call gb_UnpackedTarball_get_dir,libwps)/inc \ + -I$(call gb_UnpackedTarball_get_dir,libwps)/src/lib \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_set_precompiled_header,wps,external/libwps/inc/pch/precompiled_wps)) + +$(eval $(call gb_Library_add_defs,wps,\ + -DBUILD_WPS\ + -DDLL_EXPORT \ + -DNDEBUG \ +)) + +$(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp)) + +$(eval $(call gb_Library_add_generated_exception_objects,wps,\ + UnpackedTarball/libwps/src/lib/DosWord \ + UnpackedTarball/libwps/src/lib/Lotus \ + UnpackedTarball/libwps/src/lib/LotusChart \ + UnpackedTarball/libwps/src/lib/LotusGraph \ + UnpackedTarball/libwps/src/lib/LotusSpreadsheet \ + UnpackedTarball/libwps/src/lib/LotusStyleManager \ + UnpackedTarball/libwps/src/lib/MSWrite \ + UnpackedTarball/libwps/src/lib/Multiplan \ + UnpackedTarball/libwps/src/lib/Quattro \ + UnpackedTarball/libwps/src/lib/Quattro9 \ + UnpackedTarball/libwps/src/lib/Quattro9Graph \ + UnpackedTarball/libwps/src/lib/Quattro9Spreadsheet \ + UnpackedTarball/libwps/src/lib/QuattroDos \ + UnpackedTarball/libwps/src/lib/QuattroDosChart \ + UnpackedTarball/libwps/src/lib/QuattroDosSpreadsheet \ + UnpackedTarball/libwps/src/lib/QuattroFormula \ + UnpackedTarball/libwps/src/lib/QuattroGraph \ + UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \ + UnpackedTarball/libwps/src/lib/WKS4 \ + UnpackedTarball/libwps/src/lib/WKS4Chart \ + UnpackedTarball/libwps/src/lib/WKS4Format \ + UnpackedTarball/libwps/src/lib/WKS4Spreadsheet \ + UnpackedTarball/libwps/src/lib/WKSChart \ + UnpackedTarball/libwps/src/lib/WKSContentListener \ + UnpackedTarball/libwps/src/lib/WKSParser \ + UnpackedTarball/libwps/src/lib/WKSSubDocument \ + UnpackedTarball/libwps/src/lib/WPS4 \ + UnpackedTarball/libwps/src/lib/WPS4Graph \ + UnpackedTarball/libwps/src/lib/WPS4Text \ + UnpackedTarball/libwps/src/lib/WPS8 \ + UnpackedTarball/libwps/src/lib/WPS8Graph \ + UnpackedTarball/libwps/src/lib/WPS8Struct \ + UnpackedTarball/libwps/src/lib/WPS8Table \ + UnpackedTarball/libwps/src/lib/WPS8Text \ + UnpackedTarball/libwps/src/lib/WPS8TextStyle \ + UnpackedTarball/libwps/src/lib/WPSCell \ + UnpackedTarball/libwps/src/lib/WPSContentListener \ + UnpackedTarball/libwps/src/lib/WPSDebug \ + UnpackedTarball/libwps/src/lib/WPSDocument \ + UnpackedTarball/libwps/src/lib/WPSEntry \ + UnpackedTarball/libwps/src/lib/WPSFont \ + UnpackedTarball/libwps/src/lib/WPSGraphicShape \ + UnpackedTarball/libwps/src/lib/WPSGraphicStyle \ + UnpackedTarball/libwps/src/lib/WPSHeader \ + UnpackedTarball/libwps/src/lib/WPSList \ + UnpackedTarball/libwps/src/lib/WPSListener \ + UnpackedTarball/libwps/src/lib/WPSOLE1Parser \ + UnpackedTarball/libwps/src/lib/WPSOLEObject \ + UnpackedTarball/libwps/src/lib/WPSOLEParser \ + UnpackedTarball/libwps/src/lib/WPSOLEStream \ + UnpackedTarball/libwps/src/lib/WPSPageSpan \ + UnpackedTarball/libwps/src/lib/WPSParagraph \ + UnpackedTarball/libwps/src/lib/WPSParser \ + UnpackedTarball/libwps/src/lib/WPSStream \ + UnpackedTarball/libwps/src/lib/WPSStringStream \ + UnpackedTarball/libwps/src/lib/WPSSubDocument \ + UnpackedTarball/libwps/src/lib/WPSTable \ + UnpackedTarball/libwps/src/lib/WPSTextParser \ + UnpackedTarball/libwps/src/lib/WPSTextSubDocument \ + UnpackedTarball/libwps/src/lib/XYWrite \ + UnpackedTarball/libwps/src/lib/libwps_internal \ + UnpackedTarball/libwps/src/lib/libwps_tools_win \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libwps/Makefile b/external/libwps/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libwps/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/libwps/Module_libwps.mk b/external/libwps/Module_libwps.mk new file mode 100644 index 000000000..2b52c4acb --- /dev/null +++ b/external/libwps/Module_libwps.mk @@ -0,0 +1,31 @@ +# -*- 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,libwps)) + +$(eval $(call gb_Module_add_targets,libwps,\ + UnpackedTarball_libwps \ +)) + +ifeq ($(COM),MSC) + +$(eval $(call gb_Module_add_targets,libwps,\ + Library_wps \ +)) + +else + +$(eval $(call gb_Module_add_targets,libwps,\ + ExternalPackage_libwps \ + ExternalProject_libwps \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libwps/README b/external/libwps/README new file mode 100644 index 000000000..3ce52187d --- /dev/null +++ b/external/libwps/README @@ -0,0 +1 @@ +Microsoft Works file word processor format import library from [http://libwps.sourceforge.net/]. diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk new file mode 100644 index 000000000..f53a8fffc --- /dev/null +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -0,0 +1,31 @@ +# -*- 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,libwps)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwps)) + +$(eval $(call gb_UnpackedTarball_add_patches,libwps,\ + $(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \ + external/libwps/libtool.patch.0 \ +)) + +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,libwps,\ + external/libwps/libwps-bundled-soname.patch.0 \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libwps/inc/pch/precompiled_wps.cxx b/external/libwps/inc/pch/precompiled_wps.cxx new file mode 100644 index 000000000..9cbc329ad --- /dev/null +++ b/external/libwps/inc/pch/precompiled_wps.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_wps.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libwps/inc/pch/precompiled_wps.hxx b/external/libwps/inc/pch/precompiled_wps.hxx new file mode 100644 index 000000000..77d92f761 --- /dev/null +++ b/external/libwps/inc/pch/precompiled_wps.hxx @@ -0,0 +1,64 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2019-10-13 10:00:18 using: + ./bin/update_pch external/libwps wps --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/libwps/inc/pch/precompiled_wps.hxx "make external/libwps.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <algorithm> +#include <cassert> +#include <cctype> +#include <cmath> +#include <cstdarg> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctype.h> +#include <iomanip> +#include <iostream> +#include <iterator> +#include <libwps_internal.h> +#include <libwps_tools_win.h> +#include <limits> +#include <list> +#include <locale> +#include <map> +#include <regex> +#include <set> +#include <sstream> +#include <stack> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <string> +#include <time.h> +#include <utility> +#include <vector> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <librevenge-stream/librevenge-stream.h> +#include <librevenge/librevenge.h> +#include <libwps/libwps.h> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0 new file mode 100644 index 000000000..d3989d799 --- /dev/null +++ b/external/libwps/libtool.patch.0 @@ -0,0 +1,11 @@ +--- ltmain.sh.sav 2018-08-02 14:21:34.000000000 +0200 ++++ ltmain.sh 2019-05-05 22:04:15.433588776 +0200 +@@ -7277,7 +7277,7 @@ func_mode_link () + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ +- -fsanitize=*) ++ -fsanitize=*|-fuse-ld=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" diff --git a/external/libwps/libwps-bundled-soname.patch.0 b/external/libwps/libwps-bundled-soname.patch.0 new file mode 100644 index 000000000..013ba7a88 --- /dev/null +++ b/external/libwps/libwps-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-06 11:41:55.081239194 +0200 ++++ src/lib/Makefile.in 2015-08-06 11:42:16.903238820 +0200 +@@ -369,7 +369,7 @@ + AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DBUILD_WPS=1 + libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPS_WIN32_RESOURCE@ + libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPS_WIN32_RESOURCE@ +-libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_SOURCES = \ + libwps_internal.cpp \ + libwps_tools_win.h \ diff --git a/external/libwps/rpath.patch.0 b/external/libwps/rpath.patch.0 new file mode 100644 index 000000000..600cc3d34 --- /dev/null +++ b/external/libwps/rpath.patch.0 @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -14306,6 +14306,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*) diff --git a/external/libxml2/ExternalPackage_libxml2.mk b/external/libxml2/ExternalPackage_libxml2.mk new file mode 100644 index 000000000..d38eb68df --- /dev/null +++ b/external/libxml2/ExternalPackage_libxml2.mk @@ -0,0 +1,28 @@ +# -*- 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_ExternalPackage_ExternalPackage,libxml2,libxml2)) + +$(eval $(call gb_ExternalPackage_use_external_project,libxml2,libxml2)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.2.dylib,.libs/libxml2.2.dylib)) +else ifeq ($(OS),WNT) +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll)) +else # COM=MSC +$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) +endif +else # OS!=WNT +$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.$(LIBXML_VERSION_MICRO))) +endif +endif # DISABLE_DYNLOADING + +# vim: set noet sw=4 ts=4: diff --git a/external/libxml2/ExternalProject_libxml2.mk b/external/libxml2/ExternalProject_libxml2.mk new file mode 100644 index 000000000..778befade --- /dev/null +++ b/external/libxml2/ExternalProject_libxml2.mk @@ -0,0 +1,47 @@ +# -*- 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,libxml2)) + +$(eval $(call gb_ExternalProject_register_targets,libxml2,\ + build \ +)) + +ifeq ($(OS),WNT) +$(call gb_ExternalProject_use_external_project,libxml2,icu) + +$(eval $(call gb_ExternalProject_use_nmake,libxml2,build)) + +$(call gb_ExternalProject_get_state_target,libxml2,build): + $(call gb_Trace_StartRange,libxml2,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + cscript /e:javascript configure.js \ + iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \ + $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ + && nmake \ + ,win32) + $(call gb_Trace_EndRange,libxml2,EXTERNAL) +else # OS!=WNT +$(call gb_ExternalProject_get_state_target,libxml2,build): + $(call gb_Trace_StartRange,libxml2,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure --disable-ipv6 --without-python --without-zlib --with-sax1 \ + --without-lzma \ + $(if $(debug),--with-run-debug) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \ + LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \ + CFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g)" \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libxml2,EXTERNAL) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libxml2/Makefile b/external/libxml2/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libxml2/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/libxml2/Module_libxml2.mk b/external/libxml2/Module_libxml2.mk new file mode 100644 index 000000000..31a90fadd --- /dev/null +++ b/external/libxml2/Module_libxml2.mk @@ -0,0 +1,18 @@ +# -*- 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,libxml2)) + +$(eval $(call gb_Module_add_targets,libxml2,\ + ExternalPackage_libxml2 \ + ExternalProject_libxml2 \ + UnpackedTarball_libxml2 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libxml2/README b/external/libxml2/README new file mode 100644 index 000000000..12d96977c --- /dev/null +++ b/external/libxml2/README @@ -0,0 +1 @@ +Gnome xml parser library written in C, from [http://xmlsoft.org/] diff --git a/external/libxml2/UnpackedTarball_libxml2.mk b/external/libxml2/UnpackedTarball_libxml2.mk new file mode 100644 index 000000000..37b5bad97 --- /dev/null +++ b/external/libxml2/UnpackedTarball_libxml2.mk @@ -0,0 +1,27 @@ +# -*- 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,libxml2)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libxml2,$(LIBXML_TARBALL),,libxml2)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libxml2)) + +$(eval $(call gb_UnpackedTarball_add_patches,libxml2,\ + external/libxml2/libxml2-config.patch.1 \ + external/libxml2/libxml2-global-symbols.patch \ + external/libxml2/libxml2-vc10.patch \ + $(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \ + $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \ + external/libxml2/libxml2-icu-sym.patch.0, \ + external/libxml2/libxml2-icu.patch.0) \ + external/libxml2/ubsan.patch.0 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libxml2/libxml2-android.patch b/external/libxml2/libxml2-android.patch new file mode 100644 index 000000000..42af83274 --- /dev/null +++ b/external/libxml2/libxml2-android.patch @@ -0,0 +1,11 @@ +--- misc/libxml2-2.7.6/Makefile.in ++++ misc/build/libxml2-2.7.6/Makefile.in +@@ -1635,7 +1635,7 @@ + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive +-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \ ++all-am: Makefile $(LTLIBRARIES) \ + config.h + install-binPROGRAMS: install-libLTLIBRARIES + diff --git a/external/libxml2/libxml2-config.patch.1 b/external/libxml2/libxml2-config.patch.1 new file mode 100644 index 000000000..8c28fb6a7 --- /dev/null +++ b/external/libxml2/libxml2-config.patch.1 @@ -0,0 +1,43 @@ +Hack the xml2-config to return paths into WORKDIR. + +--- a/xml2-config.in 2009-12-17 11:45:20.000000000 +0000 ++++ b/xml2-config.in 2009-12-17 11:45:36.000000000 +0000 +@@ -1,9 +1,14 @@ + #! /bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-includedir=@includedir@ +-libdir=@libdir@ ++#prefix=@prefix@ ++#exec_prefix=@exec_prefix@ ++#includedir=@includedir@ ++#libdir=@libdir@ ++ ++prefix=${WORKDIR}/UnpackedTarball/libxml2 ++exec_prefix=${WORKDIR}/UnpackedTarball/libxml2 ++includedir=${WORKDIR}/UnpackedTarball/libxml2/include ++libdir=${WORKDIR}/UnpackedTarball/libxml2/.libs + + usage() + { +@@ -67,7 +72,8 @@ + ;; + + --cflags) +- cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@" ++ #cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@" ++ cflags="-I${includedir}" + ;; + + --libtool-libs) +@@ -91,7 +96,8 @@ + libs="@XML_LIBDIR@ $libs" + fi + +- libs="$libs @WIN32_EXTRA_LIBADD@" ++ #libs="$libs @WIN32_EXTRA_LIBADD@" ++ libs="-L${libdir} -lxml2 -lm" + ;; + + *) diff --git a/external/libxml2/libxml2-global-symbols.patch b/external/libxml2/libxml2-global-symbols.patch new file mode 100644 index 000000000..49ee73731 --- /dev/null +++ b/external/libxml2/libxml2-global-symbols.patch @@ -0,0 +1,59 @@ +--- misc/libxml2-2.7.6/libxml2.syms Tue Oct 6 18:31:35 2009 ++++ misc/build/libxml2-2.7.6/libxml2.syms Wed Jul 7 15:43:17 2010 +@@ -2184,10 +2184,10 @@ + } LIBXML2_2.6.27; + + LIBXML2_2.6.29 { +- global: ++# global: + + # threads +- xmlDllMain; ++#WIN32 only! xmlDllMain; + } LIBXML2_2.6.28; + + LIBXML2_2.6.32 { +@@ -2231,3 +2231,43 @@ + xmlHashDefaultDeallocator; + } LIBXML2_2.9.1; + ++# HACK: export global variable accessor functions (globals.h) ++LIBXML2_GLOBAL_VARIABLES { ++ global: ++# __xmlMalloc; ++# __xmlMallocAtomic; ++# __xmlRealloc; ++# __xmlFree; ++# __xmlMemStrdup; ++ __docbDefaultSAXHandler; ++ __htmlDefaultSAXHandler; ++ __xmlLastError; ++ __oldXMLWDcompatibility; ++ __xmlBufferAllocScheme; ++ __xmlDefaultBufferSize; ++ __xmlDefaultSAXHandler; ++ __xmlDefaultSAXLocator; ++ __xmlDoValidityCheckingDefaultValue; ++ __xmlGenericError; ++ __xmlStructuredError; ++ __xmlGenericErrorContext; ++ __xmlStructuredErrorContext; ++ __xmlGetWarningsDefaultValue; ++ __xmlIndentTreeOutput; ++ __xmlTreeIndentString; ++ __xmlKeepBlanksDefaultValue; ++ __xmlLineNumbersDefaultValue; ++ __xmlLoadExtDtdDefaultValue; ++ __xmlParserDebugEntities; ++ __xmlParserVersion; ++ __xmlPedanticParserDefaultValue; ++ __xmlSaveNoEmptyTags; ++ __xmlSubstituteEntitiesDefaultValue; ++ __xmlRegisterNodeDefaultValue; ++ __xmlDeregisterNodeDefaultValue; ++ __xmlParserInputBufferCreateFilenameValue; ++ __xmlOutputBufferCreateFilenameValue; ++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local") ++ local: ++ *; ++} LIBXML2_2.7.4; diff --git a/external/libxml2/libxml2-icu-sym.patch.0 b/external/libxml2/libxml2-icu-sym.patch.0 new file mode 100644 index 000000000..aac9d09ef --- /dev/null +++ b/external/libxml2/libxml2-icu-sym.patch.0 @@ -0,0 +1,37 @@ +Find bundled ICU in workdir and use debug .libs when needed + +diff -up win32/Makefile.msvc.dt win32/Makefile.msvc +--- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200 ++++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200 +@@ -46,6 +46,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" + CC = cl.exe + CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME) + CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) ++CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common + !if "$(WITH_THREADS)" != "no" + CFLAGS = $(CFLAGS) /D "_REENTRANT" + !endif +@@ -62,7 +63,9 @@ + # The linker and its options. + LD = link.exe + LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION) ++LDFLAGS = $(LDFLAGS) /LIBPATH:$(WORKDIR)/UnpackedTarball/icu/source/lib + LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) ++LDFLAGS = $(LDFLAGS) /DEBUG /OPT:REF + LIBS = + !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1" + LIBS = $(LIBS) wsock32.lib ws2_32.lib +@@ -74,9 +77,13 @@ + !if "$(STATIC)" == "1" + LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib + !else ++!if "$(WITH_RUN_DEBUG)" == "1" ++LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib ++!else + LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib + !endif + !endif ++!endif + !if "$(WITH_ZLIB)" == "1" + # could be named differently zdll or zlib + # LIBS = $(LIBS) zdll.lib diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0 new file mode 100644 index 000000000..b390b03d8 --- /dev/null +++ b/external/libxml2/libxml2-icu.patch.0 @@ -0,0 +1,33 @@ +Find bundled ICU in workdir and use debug .libs when needed + +diff -up win32/Makefile.msvc.dt win32/Makefile.msvc +--- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200 ++++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200 +@@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" + CC = cl.exe + CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME) + CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) ++CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common + !if "$(WITH_THREADS)" != "no" + CFLAGS = $(CFLAGS) /D "_REENTRANT" + !endif +@@ -67,6 +68,7 @@ CFLAGS = $(CFLAGS) $(SOLARINC) + # The linker and its options. + LD = link.exe + LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION) ++LDFLAGS = $(LDFLAGS) /LIBPATH:$(WORKDIR)/UnpackedTarball/icu/source/lib + LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) + LIBS = + !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1" +@@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib + !if "$(STATIC)" == "1" + LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib + !else ++!if "$(WITH_RUN_DEBUG)" == "1" ++LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib ++!else + LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib ++!endif + !endif + !endif + !if "$(WITH_ZLIB)" == "1" diff --git a/external/libxml2/libxml2-vc10.patch b/external/libxml2/libxml2-vc10.patch new file mode 100644 index 000000000..15bc4d973 --- /dev/null +++ b/external/libxml2/libxml2-vc10.patch @@ -0,0 +1,12 @@ +Add SOLARINC, and disable SSE2 default for MSVC2012 + +--- build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200 ++++ build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200 +@@ -59,6 +59,7 @@ + CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H" + !endif + CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE ++CFLAGS = $(CFLAGS) $(SOLARINC) + + # The linker and its options. + LD = link.exe diff --git a/external/libxml2/ubsan.patch.0 b/external/libxml2/ubsan.patch.0 new file mode 100644 index 000000000..b52259719 --- /dev/null +++ b/external/libxml2/ubsan.patch.0 @@ -0,0 +1,11 @@ +--- xpath.c ++++ xpath.c +@@ -14529,7 +14529,7 @@ + } + + stream = xmlPatterncompile(str, dict, XML_PATTERN_XPATH, +- &namespaces[0]); ++ namespaces); // i.e., &namespaces[0] if namespaces != NULL + if (namespaces != NULL) { + xmlFree((xmlChar **)namespaces); + } diff --git a/external/libxslt/ExternalPackage_libxslt.mk b/external/libxslt/ExternalPackage_libxslt.mk new file mode 100644 index 000000000..c22a2e1b5 --- /dev/null +++ b/external/libxslt/ExternalPackage_libxslt.mk @@ -0,0 +1,32 @@ +# -*- 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_ExternalPackage_ExternalPackage,libxslt,libxslt)) + +$(eval $(call gb_ExternalPackage_use_external_project,libxslt,libxslt)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib)) +$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib)) +else ifeq ($(OS),WNT) +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.dll,libxslt/.libs/libxslt.dll)) +$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.dll,libexslt/.libs/libexslt.dll)) +else # COM=MSC +$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.dll,win32/bin.msvc/libxslt.dll)) +$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll)) +endif +else # OS!=WNT +$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.$(LIBXSLT_VERSION_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.20)) +endif +endif # DISABLE_DYNLOADING + +# vim: set noet sw=4 ts=4: diff --git a/external/libxslt/ExternalProject_libxslt.mk b/external/libxslt/ExternalProject_libxslt.mk new file mode 100644 index 000000000..0602c320e --- /dev/null +++ b/external/libxslt/ExternalProject_libxslt.mk @@ -0,0 +1,55 @@ +# -*- 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,libxslt)) + +$(eval $(call gb_ExternalProject_use_external,libxslt,libxml2)) + +$(eval $(call gb_ExternalProject_register_targets,libxslt,\ + build \ +)) +ifeq ($(OS),WNT) +$(eval $(call gb_ExternalProject_use_nmake,libxslt,build)) + +$(call gb_ExternalProject_get_state_target,libxslt,build): + $(call gb_Trace_StartRange,libxslt,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + cscript /e:javascript configure.js \ + $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ + $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ + vcmanifest=yes \ + lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \ + && nmake \ + ,win32) + $(call gb_Trace_EndRange,libxslt,EXTERNAL) +else # OS!=WNT +$(call gb_ExternalProject_get_state_target,libxslt,build): + $(call gb_Trace_StartRange,libxslt,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure --without-crypto --without-python \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN" -Wl$(COMMA)-noinhibit-exec) \ + $(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ + $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \ + $(if $(filter iOS,$(OS)),LIBS="-liconv") \ + --disable-shared,--disable-static) \ + $(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,libxml2)) \ + && chmod 777 xslt-config \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/libxslt/.libs/libxslt.1.dylib \ + ) \ + ) + $(call gb_Trace_EndRange,libxslt,EXTERNAL) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/libxslt/Makefile b/external/libxslt/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libxslt/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/libxslt/Module_libxslt.mk b/external/libxslt/Module_libxslt.mk new file mode 100644 index 000000000..970433892 --- /dev/null +++ b/external/libxslt/Module_libxslt.mk @@ -0,0 +1,18 @@ +# -*- 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,libxslt)) + +$(eval $(call gb_Module_add_targets,libxslt,\ + ExternalPackage_libxslt \ + ExternalProject_libxslt \ + UnpackedTarball_libxslt \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libxslt/README b/external/libxslt/README new file mode 100644 index 000000000..dd69a9d73 --- /dev/null +++ b/external/libxslt/README @@ -0,0 +1 @@ +Gnome xslt library written in C, from [http://xmlsoft.org/xslt/] diff --git a/external/libxslt/UnpackedTarball_libxslt.mk b/external/libxslt/UnpackedTarball_libxslt.mk new file mode 100644 index 000000000..5bde97637 --- /dev/null +++ b/external/libxslt/UnpackedTarball_libxslt.mk @@ -0,0 +1,27 @@ +# -*- 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,libxslt)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libxslt,$(LIBXSLT_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libxslt)) + +$(eval $(call gb_UnpackedTarball_add_patches,libxslt,\ + external/libxslt/libxslt-config.patch.1 \ + external/libxslt/libxslt-internal-symbols.patch.1 \ + $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED),\ + external/libxslt/libxslt-msvc-sym.patch.2, \ + external/libxslt/libxslt-msvc.patch.2) \ + external/libxslt/libxslt-1.1.26-memdump.patch \ + external/libxslt/rpath.patch.0 \ + external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 b/external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 new file mode 100644 index 000000000..f82c2e4f7 --- /dev/null +++ b/external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 @@ -0,0 +1,69 @@ +From e2584eed1c84c18f16e42188c30d2c3d8e3e8853 Mon Sep 17 00:00:00 2001 +From: Chun-wei Fan <fanchunwei@src.gnome.org> +Date: Tue, 12 Nov 2019 17:37:05 +0800 +Subject: [PATCH] win32: Add configuration for profiler + +Without this the generated xsltconfig.h will not be complete as there +will be a configuration variable that is left in the header, breaking +builds. + +This will allow one to enable or disable profiler support in Windows +builds, and the default is to enable this. +--- + win32/configure.js | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/win32/configure.js b/win32/configure.js +index 56694cce..12c99f30 100644 +--- a/win32/configure.js ++++ b/win32/configure.js +@@ -47,6 +47,7 @@ var withIconv = true; + var withZlib = false; + var withCrypto = true; + var withModules = false; ++var withProfiler = true; + /* Win32 build options. */ + var dirSep = "\\"; + var compiler = "msvc"; +@@ -106,6 +107,7 @@ function usage() + txt += " zlib: Use zlib library (" + (withZlib? "yes" : "no") + ")\n"; + txt += " crypto: Enable Crypto support (" + (withCrypto? "yes" : "no") + ")\n"; + txt += " modules: Enable Module support (" + (withModules? "yes" : "no") + ")\n"; ++ txt += " profiler: Enable Profiler support (" + (withProfiler? "yes" : "no") + ")\n"; + txt += "\nWin32 build options, default value given in parentheses:\n\n"; + txt += " compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n"; + txt += " cruntime: C-runtime compiler option (only msvc) (" + cruntime + ")\n"; +@@ -192,6 +194,7 @@ function discoverVersion() + vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0")); + vf.WriteLine("WITH_CRYPTO=" + (withCrypto? "1" : "0")); + vf.WriteLine("WITH_MODULES=" + (withModules? "1" : "0")); ++ vf.WriteLine("WITH_PROFILER=" + (withProfiler? "1" : "0")); + vf.WriteLine("DEBUG=" + (buildDebug? "1" : "0")); + vf.WriteLine("STATIC=" + (buildStatic? "1" : "0")); + vf.WriteLine("PREFIX=" + buildPrefix); +@@ -240,6 +243,8 @@ function configureXslt() + of.WriteLine(s.replace(/\@WITH_DEBUGGER\@/, withDebugger? "1" : "0")); + } else if (s.search(/\@WITH_MODULES\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_MODULES\@/, withModules? "1" : "0")); ++ } else if (s.search(/\@WITH_PROFILER\@/) != -1) { ++ of.WriteLine(s.replace(/\@WITH_PROFILER\@/, withProfiler? "1" : "0")); + } else if (s.search(/\@LIBXSLT_DEFAULT_PLUGINS_PATH\@/) != -1) { + of.WriteLine(s.replace(/\@LIBXSLT_DEFAULT_PLUGINS_PATH\@/, "NULL")); + } else +@@ -343,6 +348,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { + withCrypto = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "modules") + withModules = strToBool(arg.substring(opt.length + 1, arg.length)); ++ else if (opt == "profiler") ++ withProfiler = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "compiler") + compiler = arg.substring(opt.length + 1, arg.length); + else if (opt == "cruntime") +@@ -477,6 +484,7 @@ txtOut += " Use iconv: " + boolToStr(withIconv) + "\n"; + txtOut += " With zlib: " + boolToStr(withZlib) + "\n"; + txtOut += " Crypto: " + boolToStr(withCrypto) + "\n"; + txtOut += " Modules: " + boolToStr(withModules) + "\n"; ++txtOut += " Profiler: " + boolToStr(withProfiler) + "\n"; + txtOut += "\n"; + txtOut += "Win32 build configuration\n"; + txtOut += "-------------------------\n"; diff --git a/external/libxslt/libxslt-1.1.26-memdump.patch b/external/libxslt/libxslt-1.1.26-memdump.patch new file mode 100644 index 000000000..28724f749 --- /dev/null +++ b/external/libxslt/libxslt-1.1.26-memdump.patch @@ -0,0 +1,10 @@ +--- misc/libxslt-1.1.26/xsltproc/xsltproc.c 2009-08-23 14:53:33.000000000 +0200 ++++ misc/build/libxslt-1.1.26/xsltproc/xsltproc.c 2013-01-18 14:16:12.202767222 +0100 +@@ -877,7 +877,6 @@ + xsltFreeSecurityPrefs(sec); + xsltCleanupGlobals(); + xmlCleanupParser(); +- xmlMemoryDump(); + return(errorno); + } + diff --git a/external/libxslt/libxslt-config.patch.1 b/external/libxslt/libxslt-config.patch.1 new file mode 100644 index 000000000..e4ce5d9e2 --- /dev/null +++ b/external/libxslt/libxslt-config.patch.1 @@ -0,0 +1,35 @@ +Hack the xslt-config to return paths into WORKDIR. + +--- a/xslt-config.in Wed Jan 17 14:18:26 2007 ++++ b/xslt-config.in Wed Jun 25 13:06:05 2008 +@@ -1,10 +1,16 @@ + #! /bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ ++#prefix=@prefix@ ++#exec_prefix=@exec_prefix@ ++#exec_prefix_set=no ++#includedir=@includedir@ ++#libdir=@libdir@ ++ ++prefix=${WORKDIR}/UnpackedTarball/libxslt ++exec_prefix=${WORKDIR}/UnpackedTarball/libxslt + exec_prefix_set=no +-includedir=@includedir@ +-libdir=@libdir@ ++includedir=${WORKDIR}/UnpackedTarball/libxslt ++libdir=${WORKDIR}/UnpackedTarball/libxslt + + usage() + { +@@ -92,7 +98,8 @@ + libs="@XSLT_LIBDIR@ $libs" + fi + +- libs="$libs @EXTRA_LIBS@" ++ #libs="$libs @EXTRA_LIBS@" ++ libs="-L${libdir}/libxslt/.libs -L${libdir}/libexslt/.libs -lxslt -lm" + ;; + + *) diff --git a/external/libxslt/libxslt-internal-symbols.patch.1 b/external/libxslt/libxslt-internal-symbols.patch.1 new file mode 100644 index 000000000..84a15154d --- /dev/null +++ b/external/libxslt/libxslt-internal-symbols.patch.1 @@ -0,0 +1,13 @@ +--- xslt/libxslt/libxslt.syms.orig 2017-09-05 16:25:50.504966267 +0200 ++++ xslt/libxslt/libxslt.syms 2017-09-05 16:41:00.256895709 +0200 +@@ -497,5 +497,10 @@ + + # pattern + xsltCompMatchClearCache; ++ ++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local") ++ local: ++ *; ++ + } LIBXML2_1.1.30; + diff --git a/external/libxslt/libxslt-msvc-sym.patch.2 b/external/libxslt/libxslt-msvc-sym.patch.2 new file mode 100644 index 000000000..636c22a82 --- /dev/null +++ b/external/libxslt/libxslt-msvc-sym.patch.2 @@ -0,0 +1,16 @@ +--- build/libxslt-1.1.26/win32/Makefile.msvc.old 2019-10-20 01:02:55.359375000 +0200 ++++ build/libxslt-1.1.26/win32/Makefile.msvc 2019-10-20 01:03:05.187500000 +0200 +@@ -54,11 +54,13 @@ + CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D "_REENTRANT" + CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX) + CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE ++CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common + + # The linker and its options. + LD = link.exe + LDFLAGS = /nologo + LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) ++LDFLAGS = $(LDFLAGS) /DEBUG /OPT:REF + LIBS = + + # The archiver and its options. diff --git a/external/libxslt/libxslt-msvc.patch.2 b/external/libxslt/libxslt-msvc.patch.2 new file mode 100644 index 000000000..fea5f9dc6 --- /dev/null +++ b/external/libxslt/libxslt-msvc.patch.2 @@ -0,0 +1,10 @@ +--- build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-10-20 01:02:55.359375000 +0200 ++++ build/libxslt-1.1.26/win32/Makefile.msvc 2010-10-20 01:03:05.187500000 +0200 +@@ -54,6 +54,7 @@ + CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D "_REENTRANT" + CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX) + CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE ++CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common + + # The linker and its options. + LD = link.exe diff --git a/external/libxslt/rpath.patch.0 b/external/libxslt/rpath.patch.0 new file mode 100644 index 000000000..78c485925 --- /dev/null +++ b/external/libxslt/rpath.patch.0 @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -10196,6 +10196,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd*) diff --git a/external/libzmf/ExternalProject_libzmf.mk b/external/libzmf/ExternalProject_libzmf.mk new file mode 100644 index 000000000..c6593899f --- /dev/null +++ b/external/libzmf/ExternalProject_libzmf.mk @@ -0,0 +1,48 @@ +# -*- 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,libzmf)) + +$(eval $(call gb_ExternalProject_use_autoconf,libzmf,build)) + +$(eval $(call gb_ExternalProject_register_targets,libzmf,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libzmf,\ + boost_headers \ + icu \ + libpng \ + revenge \ + zlib \ +)) + +$(call gb_ExternalProject_get_state_target,libzmf,build) : + $(call gb_Trace_StartRange,libzmf,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && MAKE=$(MAKE) ./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) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,libzmf,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/libzmf/Makefile b/external/libzmf/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/libzmf/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/libzmf/Module_libzmf.mk b/external/libzmf/Module_libzmf.mk new file mode 100644 index 000000000..c024e697c --- /dev/null +++ b/external/libzmf/Module_libzmf.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,libzmf)) + +$(eval $(call gb_Module_add_targets,libzmf,\ + ExternalProject_libzmf \ + UnpackedTarball_libzmf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libzmf/README b/external/libzmf/README new file mode 100644 index 000000000..ceb21ba87 --- /dev/null +++ b/external/libzmf/README @@ -0,0 +1,4 @@ +libzmf is a library and a set of tools for reading and converting +Zoner Draw and Zebra file formats. + +[https://wiki.documentfoundation.org/DLP/Libraries/libzmf] diff --git a/external/libzmf/UnpackedTarball_libzmf.mk b/external/libzmf/UnpackedTarball_libzmf.mk new file mode 100644 index 000000000..d37e16fcb --- /dev/null +++ b/external/libzmf/UnpackedTarball_libzmf.mk @@ -0,0 +1,20 @@ +# -*- 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,libzmf)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libzmf,$(ZMF_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libzmf)) + +$(eval $(call gb_UnpackedTarball_add_patches,libzmf, \ + external/libzmf/android-workaround.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libzmf/android-workaround.patch.1 b/external/libzmf/android-workaround.patch.1 new file mode 100644 index 000000000..a46c5e8c3 --- /dev/null +++ b/external/libzmf/android-workaround.patch.1 @@ -0,0 +1,14 @@ +--- libzmf.orig/src/lib/ZMFTypes.cpp 2017-09-17 12:14:41.987990622 +0100 ++++ libzmf/src/lib/ZMFTypes.cpp 2017-09-17 12:16:32.636850391 +0100 +@@ -38,10 +38,9 @@ + + double Point::distance(const Point &p2) const + { +- return std::hypot(p2.x - x, p2.y - y); ++ return ::hypot(p2.x - x, p2.y - y); + } + +- + BoundingBox::BoundingBox(const std::vector<Point> &points_) + : m_points(points_) + , m_width(0.0) diff --git a/external/lpsolve/ExternalPackage_lpsolve.mk b/external/lpsolve/ExternalPackage_lpsolve.mk new file mode 100644 index 000000000..23c2c5abf --- /dev/null +++ b/external/lpsolve/ExternalPackage_lpsolve.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_ExternalPackage_ExternalPackage,lpsolve,lpsolve)) + +$(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) +ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,lpsolve,$(LIBO_LIB_FOLDER)/lpsolve55.dll,lpsolve55/lpsolve55.dll)) +else ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,lpsolve,$(LIBO_LIB_FOLDER)/liblpsolve55.dylib,lpsolve55/liblpsolve55.dylib)) +else # $(OS) != WNT/MACOSX +$(eval $(call gb_ExternalPackage_add_file,lpsolve,$(LIBO_LIB_FOLDER)/liblpsolve55.so,lpsolve55/liblpsolve55.so)) +endif # $(OS) +endif # $(DISABLE_DYNLOADING) + +# vim: set noet sw=4 ts=4: diff --git a/external/lpsolve/ExternalProject_lpsolve.mk b/external/lpsolve/ExternalProject_lpsolve.mk new file mode 100644 index 000000000..b23dddf47 --- /dev/null +++ b/external/lpsolve/ExternalProject_lpsolve.mk @@ -0,0 +1,37 @@ +# -*- 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,lpsolve)) + +$(eval $(call gb_ExternalProject_register_targets,lpsolve,\ + build \ +)) + +ifeq ($(OS),WNT) +$(call gb_ExternalProject_get_state_target,lpsolve,build): + $(call gb_Trace_StartRange,lpsolve,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + LIB="$(ILIB)" RUNTIME_FLAG="$(if $(MSVC_USE_DEBUG_RUNTIME),/MDd,/MD)" \ + cmd /c cvc6.bat \ + ,lpsolve55) + $(call gb_Trace_EndRange,lpsolve,EXTERNAL) +else # $(OS)!=WNT +$(call gb_ExternalProject_get_state_target,lpsolve,build): + $(call gb_Trace_StartRange,lpsolve,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + CC="$(CC) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS))" \ + $(if $(filter MACOSX,$(OS)),EXTRA_LINKFLAGS='-install_name @__________________________________________________OOO/liblpsolve55.dylib') \ + sh -e $(if $(filter MACOSX,$(OS)),ccc.osx, \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \ + $(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \ + ccc))) \ + ,lpsolve55) + $(call gb_Trace_EndRange,lpsolve,EXTERNAL) +endif # $(OS) +# vim: set noet sw=4 ts=4: diff --git a/external/lpsolve/Makefile b/external/lpsolve/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/lpsolve/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/lpsolve/Module_lpsolve.mk b/external/lpsolve/Module_lpsolve.mk new file mode 100644 index 000000000..e0094f609 --- /dev/null +++ b/external/lpsolve/Module_lpsolve.mk @@ -0,0 +1,18 @@ +# -*- 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,lpsolve)) + +$(eval $(call gb_Module_add_targets,lpsolve,\ + UnpackedTarball_lpsolve \ + ExternalPackage_lpsolve \ + ExternalProject_lpsolve \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/lpsolve/README b/external/lpsolve/README new file mode 100644 index 000000000..3ef9db3e1 --- /dev/null +++ b/external/lpsolve/README @@ -0,0 +1 @@ +A mixed Integer Linear Programming (MILP) solver from [http://lpsolve.sourceforge.net/]. diff --git a/external/lpsolve/UnpackedTarball_lpsolve.mk b/external/lpsolve/UnpackedTarball_lpsolve.mk new file mode 100644 index 000000000..3d17c0e9b --- /dev/null +++ b/external/lpsolve/UnpackedTarball_lpsolve.mk @@ -0,0 +1,37 @@ +# -*- 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,lpsolve)) + +$(eval $(call gb_UnpackedTarball_set_tarball,lpsolve,$(LPSOLVE_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3)) + +ifeq ($(OS_FOR_BUILD),WNT) + +$(eval $(call gb_UnpackedTarball_set_patchflags,lpsolve,--binary)) +$(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\ + external/lpsolve/lp_solve_5.5-windows.patch \ +)) + +else + +$(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\ + external/lpsolve/lp_solve-aix.patch \ + external/lpsolve/lp_solve-fixed-warn.patch \ + external/lpsolve/lp_solve_5.5.patch \ + external/lpsolve/lpsolve-ubsan.patch.0 \ +)) + +$(eval $(call gb_UnpackedTarball_add_file,lpsolve,lpsolve55/ccc.static,external/lpsolve/ccc.static)) + +endif +# vim: set noet sw=4 ts=4: + + diff --git a/external/lpsolve/ccc.static b/external/lpsolve/ccc.static new file mode 100644 index 000000000..6911c4b2c --- /dev/null +++ b/external/lpsolve/ccc.static @@ -0,0 +1,11 @@ +src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' +obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'` + +opts='-O3' + +def= + +$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src + +$AR -r liblpsolve55.a $obj +rm $obj diff --git a/external/lpsolve/lp_solve-aix.patch b/external/lpsolve/lp_solve-aix.patch new file mode 100644 index 000000000..6ad5877ca --- /dev/null +++ b/external/lpsolve/lp_solve-aix.patch @@ -0,0 +1,39 @@ +--- /dev/null 2010-07-28 04:47:47.000000000 -0500 ++++ misc/build/lp_solve_5.5/lpsolve55/ccc.aix.gcc 2010-06-29 17:44:53.000000000 -0500 +@@ -0,0 +1,25 @@ ++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' ++c=$CC ++ ++def= ++so= ++if [ "$PLATFORM" = "SCO_UNIX" ] ++then def='-dy -K PIC -DNOLONGLONG' ++ dl=-lc ++else dl=-ldl ++ so=y ++fi ++ ++opts='-O3' ++ ++$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++ranlib liblpsolve55.a ++ ++if [ "$so" != "" ] ++then ++ $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++ $c -shared $lpsolve_LDFLAGS -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl ++fi ++ ++rm *.o 2>/dev/null +--- misc/lp_solve_5.5/lp_lib.h 2010-07-28 05:15:10.000000000 -0500 ++++ misc/build/lp_solve_5.5/lp_lib.h 2010-07-28 05:15:55.000000000 -0500 +@@ -56,7 +56,7 @@ + /* Define user program feature option switches */ + /* ------------------------------------------------------------------------- */ + +-#if !defined _WINDOWS && !defined _WIN32 && !defined WIN32 ++#if !defined _WINDOWS && !defined _WIN32 && !defined WIN32 && !defined(_AIX) + # define _isnan(x) FALSE + #endif + diff --git a/external/lpsolve/lp_solve-fixed-warn.patch b/external/lpsolve/lp_solve-fixed-warn.patch new file mode 100644 index 000000000..46742887a --- /dev/null +++ b/external/lpsolve/lp_solve-fixed-warn.patch @@ -0,0 +1,84 @@ +--- misc/build/lp_solve_5.5/lp_report.c 2007-01-14 10:31:34.000000000 -0800 ++++ misc/build/lp_solve_5.5/lp_report.c 2007-01-14 10:31:34.000000000 -0800 +@@ -160,7 +160,7 @@ + { + int i, k = 0; + +- fprintf(output, label); ++ fputs(label, output); + fprintf(output, "\n"); + for(i = first; i <= last; i++) { + fprintf(output, " %18g", vector[i]); +@@ -189,7 +189,7 @@ + if(last < 0) + last = lp->rows; + +- fprintf(output, label); ++ fputs(label, output); + fprintf(output, "\n"); + + if(first == 0) { +@@ -254,7 +254,7 @@ + if(last < 0) + last = lp->rows; + +- fprintf(output, label); ++ fputs(label, output); + fprintf(output, "\n"); + + for(i = first; i <= last; i++) { +--- misc/build/lp_solve_5.5/lp_rlp.h 2007-01-14 10:31:52.000000000 -0800 ++++ misc/build/lp_solve_5.5/lp_rlp.h 2007-01-14 10:31:52.000000000 -0800 +@@ -615,7 +615,7 @@ + /* This used to be an fputs(), but since the string might contain NUL's, + * we now use fwrite(). + */ +-#define ECHO (void) fwrite( lp_yytext, lp_yyleng, 1, lp_yyout ) ++#define ECHO if(fwrite( lp_yytext, lp_yyleng, 1, lp_yyout ) != 1) YY_FATAL_ERROR( "can't write into lp_yytext" ) + #endif + + /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, +--- misc/build/lp_solve_5.5/shared/commonlib.c 2007-01-14 10:33:14.000000000 -0800 ++++ misc/build/lp_solve_5.5/shared/commonlib.c 2007-01-14 10:33:14.000000000 -0800 +@@ -715,7 +715,7 @@ + { + int i, k = 0; + +- fprintf(output, label); ++ fputs(label, output); + fprintf(output, "\n"); + for(i = first; i <= last; i++) { + fprintf(output, " %5d", myvector[i]); +@@ -734,7 +734,7 @@ + { + int i, k = 0; + +- fprintf(output, label); ++ fputs(label, output); + fprintf(output, "\n"); + for(i = first; i <= last; i++) { + if(asRaw) +@@ -756,7 +756,7 @@ + { + int i, k = 0; + +- fprintf(output, label); ++ fputs(label, output); + fprintf(output, "\n"); + for(i = first; i <= last; i++) { + fprintf(output, " %18g", myvector[i]); +--- misc/build/lp_solve_5.5/shared/mmio.c 2007-01-14 10:33:14.000000000 -0800 ++++ misc/build/lp_solve_5.5/shared/mmio.c 2007-01-14 10:33:14.000000000 -0800 +@@ -74,7 +74,11 @@ + + for (i=0; i<nz; i++) + { +- fscanf(f, "%d %d %lg\n", &I[i], &J[i], &val[i]); ++ if(fscanf(f, "%d %d %lg\n", &I[i], &J[i], &val[i]) != 3) ++ { ++ fprintf(stderr, "read_unsymmetric_sparse(): could not parse values.\n"); ++ return -1; ++ } + I[i]--; /* adjust from 1-based to 0-based */ + J[i]--; + } diff --git a/external/lpsolve/lp_solve_5.5-windows.patch b/external/lpsolve/lp_solve_5.5-windows.patch new file mode 100644 index 000000000..16d5261c7 --- /dev/null +++ b/external/lpsolve/lp_solve_5.5-windows.patch @@ -0,0 +1,60 @@ +*** misc/lp_solve_5.5/lpsolve55/cgcc.bat Sun Jun 12 04:27:28 2005 +--- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Dec 14 07:55:19 2008 +*************** +*** 7,14 **** +
+ set c=gcc
+
+! rem rc lpsolve.rc
+! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin -enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% ..\lp_solve.def -o lpsolve55.dll
+
+ %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% -o liblpsolve55.so
+
+--- 7,14 ---- +
+ set c=gcc
+
+! windres lpsolve.rc lpsolve_res.obj
+! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin -enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% -o lpsolve55.dll
+
+ %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% -o liblpsolve55.so
+
+*** misc/lp_solve_5.5/lpsolve55/lpsolve.rc Sun Jun 4 00:15:24 2006 +--- misc/build/lp_solve_5.5/lpsolve55/lpsolve.rc Fri Nov 23 16:34:22 2007 +*************** +*** 7,13 **** + //
+ // Generated from the TEXTINCLUDE 2 resource.
+ //
+! #include "afxres.h"
+
+ /////////////////////////////////////////////////////////////////////////////
+ #undef APSTUDIO_READONLY_SYMBOLS
+--- 7,13 ---- + //
+ // Generated from the TEXTINCLUDE 2 resource.
+ //
+! #include "winresrc.h"
+
+ /////////////////////////////////////////////////////////////////////////////
+ #undef APSTUDIO_READONLY_SYMBOLS
+--- misc/lp_solve_5.5/lpsolve55/cvc6.bat ++++ misc/build/lp_solve_5.5/lpsolve55/cvc6.bat +@@ -14,15 +14,4 @@ + set c=cl
+
+-rc lpsolve.rc
++rc %SOLARINC% lpsolve.rc
+-%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -o lpsolve55.dll
++%c% -Zi -FS -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
+-rem /link /LINK50COMPAT
+-
+-if exist a.obj del a.obj
+-%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /MT /O1 /Zp8 /Gd /c -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src%
+-lib *.obj /OUT:liblpsolve55.lib
+-
+-if exist a.obj del a.obj
+-%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /MTd /O1 /Zp8 /Gd /c -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src%
+-lib *.obj /OUT:liblpsolve55d.lib
+-
+-if exist *.obj del *.obj
diff --git a/external/lpsolve/lp_solve_5.5.patch b/external/lpsolve/lp_solve_5.5.patch new file mode 100644 index 000000000..2b2588a9f --- /dev/null +++ b/external/lpsolve/lp_solve_5.5.patch @@ -0,0 +1,95 @@ +--- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005 ++++ misc/build/lp_solve_5.5/lpsolve55/ccc Sun May 22 11:20:19 2011 +@@ -1,25 +1,42 @@ + src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' +-c=cc ++ar=$AR ++c=$CC ++ranlib=$RANLIB + + def= + so= +-if [ "$PLATFORM" = "SCO_UNIX" ] +-then def='-dy -K PIC -DNOLONGLONG' +- dl=-lc +-else dl=-ldl +- so=y ++soprefix= ++libs= ++pic= ++ldflags= ++inline= ++if [ "$OS" = "WNT" -a "$COM" = "GCC" ]; then ++ so=dll ++ a=dll.a ++ inline=-DINLINE=static ++else ++ so=so ++ a=a ++ soprefix=lib ++ libs="-lm" ++ pic=-fpic ++ ldflags="-Wl,-Bsymbolic -Wl,-soname,liblpsolve55.$so" + fi + ++if [ "$OS" = "LINUX" ]; then ++ libs="$libs -ldl" ++fi ++ + opts='-O3' + +-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++$c -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +-ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` +-ranlib liblpsolve55.a ++$ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++$ranlib liblpsolve55.$a + + if [ "$so" != "" ] + then +- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl ++ $c $pic -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++ $c -shared $ldflags -o ${soprefix}lpsolve55.$so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $libs + fi + + rm *.o 2>/dev/null +--- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig Thu Jun 23 22:53:08 2005 ++++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx +@@ -1,23 +1,30 @@ + src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' +-c=cc ++c=$CC + ++if test -n "$verbose"; then ++ set -x ++fi ++ + def= + so= ++# EXTRA_LINKFLAGS is set in the ExternalProject_lpsolve.mk ++extra_linkflags=$EXTRA_LINKFLAGS ++ + if [ "$PLATFORM" = "SCO_UNIX" ] + then def='-DLoadInverseLib=0 -DLoadLanguageLib=0 -D__HYPER=long' + else dl=-ldl + so=y + fi + +-opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double' ++opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME' + +-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +-libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++$LIBTOOL -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` + + if [ "$so" != "" ] + then +- $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +- $c -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc ++ $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++ $c $extra_linkflags -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc + fi + + rm *.o 2>/dev/null diff --git a/external/lpsolve/lpsolve-ubsan.patch.0 b/external/lpsolve/lpsolve-ubsan.patch.0 new file mode 100644 index 000000000..7a5e308c6 --- /dev/null +++ b/external/lpsolve/lpsolve-ubsan.patch.0 @@ -0,0 +1,22 @@ +--- lp_presolve.c ++++ lp_presolve.c +@@ -168,7 +168,7 @@ + if(isprimal) { + if(psdata->primalundo != NULL) + mat = psdata->primalundo->tracker; +- solution = lp->full_solution + lp->presolve_undo->orig_rows; ++ solution = lp->full_solution == NULL ? NULL : lp->full_solution + lp->presolve_undo->orig_rows; + slacks = lp->full_solution; + } + else { +--- lp_pricePSE.c ++++ lp_pricePSE.c +@@ -145,7 +147,7 @@ + + /* Store the active/current pricing type */ + if(isdual == AUTOMATIC) +- isdual = (MYBOOL) lp->edgeVector[0]; ++ isdual = lp->edgeVector[0] != 0.0; + else + lp->edgeVector[0] = isdual; + diff --git a/external/lxml/ExternalProject_lxml.mk b/external/lxml/ExternalProject_lxml.mk new file mode 100644 index 000000000..a282546b1 --- /dev/null +++ b/external/lxml/ExternalProject_lxml.mk @@ -0,0 +1,45 @@ +# -*- 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,lxml)) + +$(eval $(call gb_ExternalProject_use_external_project,lxml,python3)) +$(eval $(call gb_ExternalProject_use_external_project,lxml,libxml2)) +$(eval $(call gb_ExternalProject_use_external_project,lxml,libxslt)) +$(eval $(call gb_ExternalProject_use_external_project,lxml,zlib)) + +$(eval $(call gb_ExternalProject_register_targets,lxml,\ + build \ +)) + +lxml_PYTHON := $(call gb_ExternalExecutable_get_command,python) + +$(call gb_ExternalProject_get_state_target,lxml,build): \ + $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_Trace_StartRange,lxml,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install && \ + $(if $(PYTHON_FOR_BUILD), \ + unset MACOSX_DEPLOYMENT_TARGET && , \ + CFLAGS="$$CFLAGS -I$(call gb_UnpackedTarball_get_dir,python3)" && \ + CFLAGS="$$CFLAGS -I$(call gb_UnpackedTarball_get_dir,python3)/Include" && \ + LDFLAGS="$$LDFLAGS -L$(call gb_UnpackedTarball_get_dir,python3)" && \ + _PYTHON_PROJECT_BASE=$(call gb_UnpackedTarball_get_dir,python3) && \ + export CFLAGS LDFLAGS _PYTHON_PROJECT_BASE && ) \ + $(lxml_PYTHON) setup.py build \ + $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \ + $(if $(SYSTEM_LIBXSLT),,--with-xslt-config=$(call gb_UnpackedTarball_get_dir,libxslt)/xslt-config) && \ + rm -fr install && \ + mkdir install && \ + $(lxml_PYTHON) setup.py install \ + --install-lib install \ + ) + $(call gb_Trace_EndRange,lxml,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/lxml/Makefile b/external/lxml/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/lxml/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/lxml/Module_lxml.mk b/external/lxml/Module_lxml.mk new file mode 100644 index 000000000..9fe3b85ad --- /dev/null +++ b/external/lxml/Module_lxml.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,lxml)) + +$(eval $(call gb_Module_add_targets,lxml,\ + UnpackedTarball_lxml \ + ExternalProject_lxml \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/lxml/README b/external/lxml/README new file mode 100644 index 000000000..ad9f0952c --- /dev/null +++ b/external/lxml/README @@ -0,0 +1,7 @@ +LXML XML processing python Library from [http://lxml.de/]. + +This library is used for the .ui accessibility checker bin/gla11y + +The archive was downloaded from: +[http://lxml.de/files/lxml-4.1.1.tgz] +on 2018-02-22. diff --git a/external/lxml/UnpackedTarball_lxml.mk b/external/lxml/UnpackedTarball_lxml.mk new file mode 100644 index 000000000..bfb5dc2b0 --- /dev/null +++ b/external/lxml/UnpackedTarball_lxml.mk @@ -0,0 +1,14 @@ +# -*- 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,lxml)) + +$(eval $(call gb_UnpackedTarball_set_tarball,lxml,$(LXML_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/mariadb-connector-c/Makefile b/external/mariadb-connector-c/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/mariadb-connector-c/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/mariadb-connector-c/Module_mariadb-connector-c.mk b/external/mariadb-connector-c/Module_mariadb-connector-c.mk new file mode 100644 index 000000000..e6608a011 --- /dev/null +++ b/external/mariadb-connector-c/Module_mariadb-connector-c.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,mariadb-connector-c)) + +$(eval $(call gb_Module_add_targets,mariadb-connector-c,\ + StaticLibrary_mariadb-connector-c \ + UnpackedTarball_mariadb-connector-c \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/mariadb-connector-c/README b/external/mariadb-connector-c/README new file mode 100644 index 000000000..25209f97f --- /dev/null +++ b/external/mariadb-connector-c/README @@ -0,0 +1,8 @@ +MariaDB Connector/C + +https://mariadb.com/kb/en/mariadb-connector-c-release-notes/ +https://downloads.mariadb.com/Connectors/c/ + +configs/ generated like this: + +cmake -DWITH_CURL=OFF -DWITH_SSL=OFF -DWITH_UNIT_TESTS=OFF -DWITH_DYNCOL=OFF .../workdir/UnpackedTarball/mariadb-connector-c/ diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk new file mode 100644 index 000000000..664d58b03 --- /dev/null +++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk @@ -0,0 +1,84 @@ +# -*- 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_StaticLibrary_StaticLibrary,mariadb-connector-c)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,mariadb-connector-c)) + +$(eval $(call gb_StaticLibrary_use_unpacked,mariadb-connector-c,mariadb-connector-c)) + +$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\ + $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/include \ +)) + +# This is needed for MSVC 2008: it somehow finds a dlopen somewhere +# but the static library then contains unreferenced symbols. +# This macro enables a re-definition to native Win32 APIs in my_global.h. +## TODO missing enable: -D HAVE_COMPRESS +## (but then need to add "-lz" to mysqlcppconn linking) +$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1)) + +ifeq ($(OS),WNT) +$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED -DHAVE_STRTOULL)) +$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\ + $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \ +)) +else +$(eval $(call gb_StaticLibrary_use_external,mariadb-connector-c,openssl_headers)) +$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_OPENSSL)) +endif + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\ + UnpackedTarball/mariadb-connector-c/libmariadb/bmove_upp \ + UnpackedTarball/mariadb-connector-c/libmariadb/get_password \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_alloc \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_array \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_charset \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_compress \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_context \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_default \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_dtoa \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_errmsg \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_hash \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_init \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_io \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_list \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_ll2str \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_loaddata \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_net \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_password \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_pvio \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_sha1 \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_stmt_codec \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_string \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_time \ + UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_async \ + UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_charset \ + UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_dyncol \ + UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_lib \ + UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \ + UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \ + UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \ + UnpackedTarball/mariadb-connector-c/plugins/auth/dialog \ + UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \ + UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \ + $(if $(filter $(OS),WNT), \ + UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \ + UnpackedTarball/mariadb-connector-c/libmariadb/secure/win_crypt \ + UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv \ + , \ + UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_npipe \ + UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_shmem \ + UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt \ + ) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk new file mode 100644 index 000000000..2f679294f --- /dev/null +++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk @@ -0,0 +1,47 @@ +# -*- 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,mariadb-connector-c)) + +$(eval $(call gb_UnpackedTarball_set_tarball,mariadb-connector-c,$(MARIADB_CONNECTOR_C_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/mariadb_version.h,external/mariadb-connector-c/configs/mariadb_version.h)) + +ifeq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/wnt_ma_config.h)) +else +ifeq ($(OS),MACOSX) +$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/mac_my_config.h)) +else +$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/linux_my_config.h)) +endif +endif # $(OS),WNT + +$(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb-connector-c,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\ + external/mariadb-connector-c/clang-cl.patch.0 \ +)) + +# TODO are any "plugins" needed? +$(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \ + < libmariadb/ma_client_plugin.c.in sed \ + -e 's/@EXTERNAL_PLUGINS@/ \ + extern struct st_mysql_client_plugin pvio_socket_client_plugin\; \ + extern struct st_mysql_client_plugin caching_sha2_password_client_plugin\; \ + /' \ + -e 's/@BUILTIN_PLUGINS@/ \ + (struct st_mysql_client_plugin *)\&pvio_socket_client_plugin$(COMMA) \ + (struct st_mysql_client_plugin *)\&caching_sha2_password_client_plugin$(COMMA) \ + /' \ + > libmariadb/ma_client_plugin.c \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/external/mariadb-connector-c/clang-cl.patch.0 b/external/mariadb-connector-c/clang-cl.patch.0 new file mode 100644 index 000000000..4c9ef4def --- /dev/null +++ b/external/mariadb-connector-c/clang-cl.patch.0 @@ -0,0 +1,11 @@ +--- unittest/libmariadb/getopt.c ++++ unittest/libmariadb/getopt.c +@@ -38,7 +38,7 @@ + #include <config.h> + #endif + +-#if (!defined (__STDC__) || !__STDC__) && !defined(MSDOS) && !defined(OS2) ++#if (!defined (__STDC__) || !__STDC__) && !defined(MSDOS) && !defined(OS2) && !(defined _MSC_VER && defined __clang__) + /* This is a separate conditional since some stdc systems + reject `defined (const)'. */ + #ifndef const diff --git a/external/mariadb-connector-c/configs/linux_my_config.h b/external/mariadb-connector-c/configs/linux_my_config.h new file mode 100644 index 000000000..577a6e163 --- /dev/null +++ b/external/mariadb-connector-c/configs/linux_my_config.h @@ -0,0 +1,142 @@ + +/* + * Include file constants (processed in LibmysqlIncludeFiles.txt 1 + */ +/* #undef HAVE_OPENSSL_APPLINK_C */ +#define HAVE_ALLOCA_H 1 +/* #undef HAVE_BIGENDIAN */ +#define HAVE_SETLOCALE 1 +#define HAVE_NL_LANGINFO 1 +#define HAVE_DLFCN_H 1 +#define HAVE_FCNTL_H 1 +#define HAVE_FLOAT_H 1 +#define HAVE_LIMITS_H 1 +#define HAVE_PWD_H 1 +/* #undef HAVE_SELECT_H */ +#define HAVE_STDDEF_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +#define HAVE_SYS_IOCTL_H 1 +#define HAVE_SYS_SELECT_H 1 +#define HAVE_SYS_SOCKET_H 1 +/* #undef HAVE_SYS_STREAM_H */ +#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_UN_H 1 +#define HAVE_UNISTD_H 1 +#define HAVE_UCONTEXT_H 1 + +/* + * function definitions - processed in LibmysqlFunctions.txt + */ + +/* #undef HAVE_DLERROR */ +/* #undef HAVE_DLOPEN */ +#define HAVE_GETPWUID 1 +#define HAVE_MEMCPY 1 +#define HAVE_POLL 1 +/* #undef HAVE_STRTOK_R */ +/* #undef HAVE_STRTOL */ +/* #undef HAVE_STRTOLL */ +/* #undef HAVE_STRTOUL */ +/* #undef HAVE_STRTOULL */ +/* #undef HAVE_TELL */ +/* #undef HAVE_THR_SETCONCURRENCY */ +/* #undef HAVE_THR_YIELD */ +/* #undef HAVE_VASPRINTF */ +/* #undef HAVE_VSNPRINTF */ +#define HAVE_CUSERID 1 + +/* + * types and sizes + */ + + +#define SIZEOF_CHARP 8 +#if defined(SIZEOF_CHARP) +# define HAVE_CHARP 1 +#endif + + +#define SIZEOF_INT 4 +#if defined(SIZEOF_INT) +# define HAVE_INT 1 +#endif + +#define SIZEOF_LONG 8 +#if defined(SIZEOF_LONG) +# define HAVE_LONG 1 +#endif + +#define SIZEOF_LONG_LONG 8 +#if defined(SIZEOF_LONG_LONG) +# define HAVE_LONG_LONG 1 +#endif + + +#define SIZEOF_SIZE_T 8 +#if defined(SIZEOF_SIZE_T) +# define HAVE_SIZE_T 1 +#endif + + +#define SIZEOF_UINT 4 +#if defined(SIZEOF_UINT) +# define HAVE_UINT 1 +#endif + +#define SIZEOF_ULONG 8 +#if defined(SIZEOF_ULONG) +# define HAVE_ULONG 1 +#endif + +/* #undef SIZEOF_INT8 */ +#if defined(SIZEOF_INT8) +# define HAVE_INT8 1 +#endif +/* #undef SIZEOF_UINT8 */ +#if defined(SIZEOF_UINT8) +# define HAVE_UINT8 1 +#endif + +/* #undef SIZEOF_INT16 */ +#if defined(SIZEOF_INT16) +# define HAVE_INT16 1 +#endif +/* #undef SIZEOF_UINT16 */ +#if defined(SIZEOF_UINT16) +# define HAVE_UINT16 1 +#endif + +/* #undef SIZEOF_INT32 */ +#if defined(SIZEOF_INT32) +# define HAVE_INT32 1 +#endif +/* #undef SIZEOF_UINT32 */ +#if defined(SIZEOF_UINT32) +# define HAVE_UINT32 1 +#endif + +/* #undef SIZEOF_INT64 */ +#if defined(SIZEOF_INT64) +# define HAVE_INT64 1 +#endif +/* #undef SIZEOF_UINT64 */ +#if defined(SIZEOF_UINT64) +# define HAVE_UINT64 1 +#endif + +/* #undef SIZEOF_SOCKLEN_T */ +#if defined(SIZEOF_SOCKLEN_T) +# define HAVE_SOCKLEN_T 1 +#endif + +#define SOCKET_SIZE_TYPE socklen_t + +#define LOCAL_INFILE_MODE_OFF 0 +#define LOCAL_INFILE_MODE_ON 1 +#define LOCAL_INFILE_MODE_AUTO 2 +#define ENABLED_LOCAL_INFILE LOCAL_INFILE_MODE_AUTO + +#define MARIADB_DEFAULT_CHARSET "latin1" + diff --git a/external/mariadb-connector-c/configs/mac_my_config.h b/external/mariadb-connector-c/configs/mac_my_config.h new file mode 100644 index 000000000..c94856115 --- /dev/null +++ b/external/mariadb-connector-c/configs/mac_my_config.h @@ -0,0 +1,142 @@ + +/* + * Include file constants (processed in LibmysqlIncludeFiles.txt 1 + */ +/* #undef HAVE_OPENSSL_APPLINK_C */ +#define HAVE_ALLOCA_H 1 +/* #undef HAVE_BIGENDIAN */ +#define HAVE_SETLOCALE 1 +#define HAVE_NL_LANGINFO 1 +#define HAVE_DLFCN_H 1 +#define HAVE_FCNTL_H 1 +#define HAVE_FLOAT_H 1 +#define HAVE_LIMITS_H 1 +#define HAVE_PWD_H 1 +/* #undef HAVE_SELECT_H */ +#define HAVE_STDDEF_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +#define HAVE_SYS_IOCTL_H 1 +#define HAVE_SYS_SELECT_H 1 +#define HAVE_SYS_SOCKET_H 1 +/* #undef HAVE_SYS_STREAM_H */ +#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_UN_H 1 +#define HAVE_UNISTD_H 1 +/* #undef HAVE_UCONTEXT_H */ + +/* + * function definitions - processed in LibmysqlFunctions.txt + */ + +#define HAVE_DLERROR 1 +#define HAVE_DLOPEN 1 +#define HAVE_GETPWUID 1 +#define HAVE_MEMCPY 1 +#define HAVE_POLL 1 +/* #undef HAVE_STRTOK_R */ +/* #undef HAVE_STRTOL */ +/* #undef HAVE_STRTOLL */ +/* #undef HAVE_STRTOUL */ +/* #undef HAVE_STRTOULL */ +/* #undef HAVE_TELL */ +/* #undef HAVE_THR_SETCONCURRENCY */ +/* #undef HAVE_THR_YIELD */ +/* #undef HAVE_VASPRINTF */ +/* #undef HAVE_VSNPRINTF */ +/* #undef HAVE_CUSERID */ + +/* + * types and sizes + */ + + +#define SIZEOF_CHARP 8 +#if defined(SIZEOF_CHARP) +# define HAVE_CHARP 1 +#endif + + +#define SIZEOF_INT 4 +#if defined(SIZEOF_INT) +# define HAVE_INT 1 +#endif + +#define SIZEOF_LONG 8 +#if defined(SIZEOF_LONG) +# define HAVE_LONG 1 +#endif + +#define SIZEOF_LONG_LONG 8 +#if defined(SIZEOF_LONG_LONG) +# define HAVE_LONG_LONG 1 +#endif + + +#define SIZEOF_SIZE_T 8 +#if defined(SIZEOF_SIZE_T) +# define HAVE_SIZE_T 1 +#endif + + +#define SIZEOF_UINT 4 +#if defined(SIZEOF_UINT) +# define HAVE_UINT 1 +#endif + +/* #undef SIZEOF_ULONG */ +#if defined(SIZEOF_ULONG) +# define HAVE_ULONG 1 +#endif + +/* #undef SIZEOF_INT8 */ +#if defined(SIZEOF_INT8) +# define HAVE_INT8 1 +#endif +/* #undef SIZEOF_UINT8 */ +#if defined(SIZEOF_UINT8) +# define HAVE_UINT8 1 +#endif + +/* #undef SIZEOF_INT16 */ +#if defined(SIZEOF_INT16) +# define HAVE_INT16 1 +#endif +/* #undef SIZEOF_UINT16 */ +#if defined(SIZEOF_UINT16) +# define HAVE_UINT16 1 +#endif + +/* #undef SIZEOF_INT32 */ +#if defined(SIZEOF_INT32) +# define HAVE_INT32 1 +#endif +/* #undef SIZEOF_UINT32 */ +#if defined(SIZEOF_UINT32) +# define HAVE_UINT32 1 +#endif + +/* #undef SIZEOF_INT64 */ +#if defined(SIZEOF_INT64) +# define HAVE_INT64 1 +#endif +/* #undef SIZEOF_UINT64 */ +#if defined(SIZEOF_UINT64) +# define HAVE_UINT64 1 +#endif + +/* #undef SIZEOF_SOCKLEN_T */ +#if defined(SIZEOF_SOCKLEN_T) +# define HAVE_SOCKLEN_T 1 +#endif + +#define SOCKET_SIZE_TYPE socklen_t + +#define LOCAL_INFILE_MODE_OFF 0 +#define LOCAL_INFILE_MODE_ON 1 +#define LOCAL_INFILE_MODE_AUTO 2 +#define ENABLED_LOCAL_INFILE LOCAL_INFILE_MODE_AUTO + +#define MARIADB_DEFAULT_CHARSET "latin1" + diff --git a/external/mariadb-connector-c/configs/mariadb_version.h b/external/mariadb-connector-c/configs/mariadb_version.h new file mode 100644 index 000000000..7344982a6 --- /dev/null +++ b/external/mariadb-connector-c/configs/mariadb_version.h @@ -0,0 +1,38 @@ +/* Copyright Abandoned 1996, 1999, 2001 MySQL AB + This file is public domain and comes with NO WARRANTY of any kind */ + +/* Version numbers for protocol & mysqld */ + +#ifndef _mariadb_version_h_ +#define _mariadb_version_h_ + +#ifdef _CUSTOMCONFIG_ +#include <custom_conf.h> +#else +#define PROTOCOL_VERSION 10 +#define MARIADB_CLIENT_VERSION_STR "10.4.3" +#define MARIADB_BASE_VERSION "mariadb-10.4" +#define MARIADB_VERSION_ID 100403 +#define MARIADB_PORT 3306 +#define MARIADB_UNIX_ADDR "/tmp/mysql.sock" + +#define MYSQL_CONFIG_NAME "my" +#define MYSQL_VERSION_ID 100403 +#define MYSQL_SERVER_VERSION "10.4.3-MariaDB" + +#define MARIADB_PACKAGE_VERSION "3.1.8" +#define MARIADB_PACKAGE_VERSION_ID 30108 +#define MARIADB_SYSTEM_TYPE "Linux" +#define MARIADB_MACHINE_TYPE "x86_64" +#define MARIADB_PLUGINDIR "/usr/local/lib/mariadb/plugin" + +/* mysqld compile time options */ +#ifndef MYSQL_CHARSET +#define MYSQL_CHARSET "" +#endif +#endif + +/* Source information */ +#define CC_SOURCE_REVISION "" + +#endif /* _mariadb_version_h_ */ diff --git a/external/mariadb-connector-c/configs/wnt_ma_config.h b/external/mariadb-connector-c/configs/wnt_ma_config.h new file mode 100644 index 000000000..d06393509 --- /dev/null +++ b/external/mariadb-connector-c/configs/wnt_ma_config.h @@ -0,0 +1,154 @@ + +/* + * Include file constants (processed in LibmysqlIncludeFiles.txt 1 + */ +/* #undef HAVE_OPENSSL_APPLINK_C */ +/* #undef HAVE_ALLOCA_H */ +/* #undef HAVE_BIGENDIAN */ +#define HAVE_SETLOCALE 1 +/* #undef HAVE_NL_LANGINFO */ +/* #undef HAVE_DLFCN_H */ +#define HAVE_FCNTL_H 1 +#define HAVE_FLOAT_H 1 +#define HAVE_LIMITS_H 1 +/* #undef HAVE_PWD_H */ +/* #undef HAVE_SELECT_H */ +#define HAVE_STDDEF_H 1 +/* #undef HAVE_STDINT_H */ +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +/* #undef HAVE_SYS_IOCTL_H */ +/* #undef HAVE_SYS_SELECT_H */ +/* #undef HAVE_SYS_SOCKET_H */ +/* #undef HAVE_SYS_STREAM_H */ +#define HAVE_SYS_TYPES_H 1 +/* #undef HAVE_SYS_UN_H */ +/* #undef HAVE_UNISTD_H */ +/* #undef HAVE_UCONTEXT_H */ + +/* + * function definitions - processed in LibmysqlFunctions.txt + */ + +/* #undef HAVE_DLERROR */ +/* #undef HAVE_DLOPEN */ +/* #undef HAVE_GETPWUID */ +#define HAVE_MEMCPY 1 +/* #undef HAVE_POLL */ +/* #undef HAVE_STRTOK_R */ +#define HAVE_STRTOL 1 +/* #undef HAVE_STRTOLL */ +#define HAVE_STRTOUL 1 +/* #undef HAVE_STRTOULL */ +#define HAVE_TELL 1 +/* #undef HAVE_THR_SETCONCURRENCY */ +/* #undef HAVE_THR_YIELD */ +/* #undef HAVE_VASPRINTF */ +#define HAVE_VSNPRINTF 1 +/* #undef HAVE_CUSERID */ + +/* + * types and sizes + */ + + +#ifdef _M_X64 +#define SIZEOF_CHARP 8 +#else +#define SIZEOF_CHARP 4 +#endif +#if defined(SIZEOF_CHARP) +# define HAVE_CHARP 1 +#endif + + +#define SIZEOF_INT 4 +#if defined(SIZEOF_INT) +# define HAVE_INT 1 +#endif + +#define SIZEOF_LONG 4 +#if defined(SIZEOF_LONG) +# define HAVE_LONG 1 +#endif + +#ifdef _M_X64 +#define SIZEOF_LONG_LONG 8 +#else +#define SIZEOF_LONG_LONG 4 +#endif +#if defined(SIZEOF_LONG_LONG) +# define HAVE_LONG_LONG 1 +#endif + + +#ifdef _M_X64 +#define SIZEOF_SIZE_T 8 +#else +#define SIZEOF_SIZE_T 4 +#endif +#if defined(SIZEOF_SIZE_T) +# define HAVE_SIZE_T 1 +#endif + + +/* #undef SIZEOF_UINT */ +#if defined(SIZEOF_UINT) +# define HAVE_UINT 1 +#endif + +/* #undef SIZEOF_ULONG */ +#if defined(SIZEOF_ULONG) +# define HAVE_ULONG 1 +#endif + +/* #undef SIZEOF_INT8 */ +#if defined(SIZEOF_INT8) +# define HAVE_INT8 1 +#endif +/* #undef SIZEOF_UINT8 */ +#if defined(SIZEOF_UINT8) +# define HAVE_UINT8 1 +#endif + +/* #undef SIZEOF_INT16 */ +#if defined(SIZEOF_INT16) +# define HAVE_INT16 1 +#endif +/* #undef SIZEOF_UINT16 */ +#if defined(SIZEOF_UINT16) +# define HAVE_UINT16 1 +#endif + +/* #undef SIZEOF_INT32 */ +#if defined(SIZEOF_INT32) +# define HAVE_INT32 1 +#endif +/* #undef SIZEOF_UINT32 */ +#if defined(SIZEOF_UINT32) +# define HAVE_UINT32 1 +#endif + +/* #undef SIZEOF_INT64 */ +#if defined(SIZEOF_INT64) +# define HAVE_INT64 1 +#endif +/* #undef SIZEOF_UINT64 */ +#if defined(SIZEOF_UINT64) +# define HAVE_UINT64 1 +#endif + +/* #undef SIZEOF_SOCKLEN_T */ +#if defined(SIZEOF_SOCKLEN_T) +# define HAVE_SOCKLEN_T 1 +#endif + +#define SOCKET_SIZE_TYPE int + +#define LOCAL_INFILE_MODE_OFF 0 +#define LOCAL_INFILE_MODE_ON 1 +#define LOCAL_INFILE_MODE_AUTO 2 +#define ENABLED_LOCAL_INFILE LOCAL_INFILE_MODE_AUTO + +#define MARIADB_DEFAULT_CHARSET "latin1" + diff --git a/external/mdds/Makefile b/external/mdds/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/mdds/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/mdds/Module_mdds.mk b/external/mdds/Module_mdds.mk new file mode 100644 index 000000000..47745940b --- /dev/null +++ b/external/mdds/Module_mdds.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/. +# + +$(eval $(call gb_Module_Module,mdds)) + +$(eval $(call gb_Module_add_targets,mdds,\ + UnpackedTarball_mdds \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/mdds/README b/external/mdds/README new file mode 100644 index 000000000..140f07bac --- /dev/null +++ b/external/mdds/README @@ -0,0 +1,4 @@ +Multi-dimensional data structure (mdds) library, available from [https://gitlab.com/mdds/mdds]. + +mdds primarily provides data structures that are used by the calc +core. diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk new file mode 100644 index 000000000..17834c6d1 --- /dev/null +++ b/external/mdds/UnpackedTarball_mdds.mk @@ -0,0 +1,21 @@ +# -*- 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,mdds)) + +$(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,mdds,\ + external/mdds/remove-warnings.diff \ + external/mdds/delta-signed-int.diff \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/mdds/delta-signed-int.diff b/external/mdds/delta-signed-int.diff new file mode 100644 index 000000000..8612b8543 --- /dev/null +++ b/external/mdds/delta-signed-int.diff @@ -0,0 +1,44 @@ +diff --git a/include/mdds/multi_type_vector.hpp b/include/mdds/multi_type_vector.hpp +index d941ee2..71c34f3 100644 +--- a/include/mdds/multi_type_vector.hpp ++++ b/include/mdds/multi_type_vector.hpp +@@ -1071,7 +1071,7 @@ public: + + private: + +- void adjust_block_positions(int64_t start_block_index, size_type delta); ++ void adjust_block_positions(int64_t start_block_index, int64_t delta); + + /** + * Delete only the element block owned by an outer block. +diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl +index d4fff49..7509e3e 100644 +--- a/include/mdds/multi_type_vector_def.inl ++++ b/include/mdds/multi_type_vector_def.inl +@@ -503,7 +503,7 @@ multi_type_vector<_CellBlockFunc, _EventFunc>::set(const iterator& pos_hint, siz + } + + template<typename _CellBlockFunc, typename _EventFunc> +-void multi_type_vector<_CellBlockFunc, _EventFunc>::adjust_block_positions(int64_t start_block_index, size_type delta) ++void multi_type_vector<_CellBlockFunc, _EventFunc>::adjust_block_positions(int64_t start_block_index, int64_t delta) + { + int64_t n = m_blocks.size(); + +@@ -2927,7 +2927,7 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::erase_impl(size_type start_r + // Now, erase all blocks in between. + delete_element_blocks(it_erase_begin, it_erase_end); + auto it_adjust_block = m_blocks.erase(it_erase_begin, it_erase_end); +- size_type delta = end_row - start_row + 1; ++ int64_t delta = end_row - start_row + 1; + m_cur_size -= delta; + + if (m_blocks.empty()) +@@ -2945,7 +2945,7 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::erase_in_single_block( + { + // Range falls within the same block. + block* blk = &m_blocks[block_pos]; +- size_type size_to_erase = end_pos - start_pos + 1; ++ int64_t size_to_erase = end_pos - start_pos + 1; + if (blk->mp_data) + { + // Erase data in the data block. diff --git a/external/mdds/remove-warnings.diff b/external/mdds/remove-warnings.diff new file mode 100644 index 000000000..b98ddb9ee --- /dev/null +++ b/external/mdds/remove-warnings.diff @@ -0,0 +1,84 @@ +diff --git a/configure.ac b/configure.ac +index ef22726..00ab937 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -70,7 +70,7 @@ AC_ARG_ENABLE(openmp, + ) + + AS_IF([test x"$enable_openmp" == "xyes"], [ +- CXXFLAGS="$CXXFLAGS -fopenmp" ++ CXXFLAGS="$CXXFLAGS -fopenmp -DMDDS_USE_OPENMP=1" + LDFLAGS="$LDFLAGS -fopenmp" + ]) + +diff --git a/include/mdds/global.hpp b/include/mdds/global.hpp +index f92f0a5..11f0325 100644 +--- a/include/mdds/global.hpp ++++ b/include/mdds/global.hpp +@@ -65,6 +65,10 @@ + #define MDDS_LOOP_UNROLLING 1 + #endif + ++#ifndef MDDS_USE_OPENMP ++#define MDDS_USE_OPENMP 0 ++#endif ++ + namespace mdds { + + class general_error : public ::std::exception +diff --git a/include/mdds/multi_type_vector.hpp b/include/mdds/multi_type_vector.hpp +index 1c50a42..d941ee2 100644 +--- a/include/mdds/multi_type_vector.hpp ++++ b/include/mdds/multi_type_vector.hpp +@@ -1126,8 +1126,7 @@ private: + void append_cell_to_block(size_type block_index, const _T& cell); + + template<typename _T> +- iterator set_cell_to_empty_block( +- size_type start_row, size_type block_index, size_type pos_in_block, const _T& cell); ++ iterator set_cell_to_empty_block(size_type block_index, size_type pos_in_block, const _T& cell); + + template<typename _T> + iterator set_cell_to_block_of_size_one( +diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl +index a4cfe6d..d4fff49 100644 +--- a/include/mdds/multi_type_vector_def.inl ++++ b/include/mdds/multi_type_vector_def.inl +@@ -516,7 +516,9 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::adjust_block_positions(int64 + int64_t rem = len % 8; + len -= rem; + len += start_block_index; ++#if MDDS_USE_OPENMP + #pragma omp parallel for ++#endif + for (int64_t i = start_block_index; i < len; i += 8) + { + m_blocks[i].m_position += delta; +@@ -533,7 +535,9 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::adjust_block_positions(int64 + for (int64_t i = len; i < rem; ++i) + m_blocks[i].m_position += delta; + #else ++#if MDDS_USE_OPENMP + #pragma omp parallel for ++#endif + for (int64_t i = start_block_index; i < n; ++i) + m_blocks[i].m_position += delta; + #endif +@@ -583,7 +587,7 @@ multi_type_vector<_CellBlockFunc, _EventFunc>::set_impl(size_type pos, size_type + if (!blk->mp_data) + { + // This is an empty block. +- return set_cell_to_empty_block(start_row, block_index, pos_in_block, value); ++ return set_cell_to_empty_block(block_index, pos_in_block, value); + } + + assert(blk->mp_data); +@@ -1027,7 +1031,7 @@ template<typename _CellBlockFunc, typename _EventFunc> + template<typename _T> + typename multi_type_vector<_CellBlockFunc, _EventFunc>::iterator + multi_type_vector<_CellBlockFunc, _EventFunc>::set_cell_to_empty_block( +- size_type start_row, size_type block_index, size_type pos_in_block, const _T& cell) ++ size_type block_index, size_type pos_in_block, const _T& cell) + { + block* blk = &m_blocks[block_index]; + assert(!blk->mp_data); // In this call, the current block is an empty block. diff --git a/external/mdnsresponder/Makefile b/external/mdnsresponder/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/mdnsresponder/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/mdnsresponder/Module_mdnsresponder.mk b/external/mdnsresponder/Module_mdnsresponder.mk new file mode 100644 index 000000000..b2996840b --- /dev/null +++ b/external/mdnsresponder/Module_mdnsresponder.mk @@ -0,0 +1,20 @@ +# -*- 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,mdnsresponder)) + +$(eval $(call gb_Module_add_targets,mdnsresponder,\ + UnpackedTarball_mDNSResponder \ +)) + +$(eval $(call gb_Module_add_targets,mdnsresponder,\ + StaticLibrary_mDNSResponder \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/mdnsresponder/README b/external/mdnsresponder/README new file mode 100644 index 000000000..d263b0521 --- /dev/null +++ b/external/mdnsresponder/README @@ -0,0 +1,4 @@ +Apple's ZeroConf Multicast DNS implementation + +https://developer.apple.com/bonjour/ +http://www.opensource.apple.com/tarballs/mDNSResponder/ diff --git a/external/mdnsresponder/StaticLibrary_mDNSResponder.mk b/external/mdnsresponder/StaticLibrary_mDNSResponder.mk new file mode 100644 index 000000000..222776ad3 --- /dev/null +++ b/external/mdnsresponder/StaticLibrary_mDNSResponder.mk @@ -0,0 +1,37 @@ +# -*- 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_StaticLibrary_StaticLibrary,mDNSResponder)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,mDNSResponder)) + +$(eval $(call gb_StaticLibrary_use_unpacked,mDNSResponder,mDNSResponder)) + +$(eval $(call gb_StaticLibrary_set_include,mDNSResponder,\ + -I$(call gb_UnpackedTarball_get_dir,mDNSResponder)/mDNSShared \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_defs,mDNSResponder,\ + -DWIN32_LEAN_AND_MEAN \ + -D_WINSOCK_DEPRECATED_NO_WARNINGS \ + -DUSE_TCP_LOOPBACK \ + -DNOT_HAVE_SA_LEN \ +)) + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,mDNSResponder,\ + UnpackedTarball/mDNSResponder/mDNSShared/DebugServices \ + UnpackedTarball/mDNSResponder/mDNSShared/GenLinkedList \ + UnpackedTarball/mDNSResponder/mDNSShared/dnssd_clientlib \ + UnpackedTarball/mDNSResponder/mDNSShared/dnssd_clientstub \ + UnpackedTarball/mDNSResponder/mDNSShared/dnssd_ipc \ + UnpackedTarball/mDNSResponder/mDNSWindows/DLL/dllmain \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk new file mode 100644 index 000000000..9b436b2f0 --- /dev/null +++ b/external/mdnsresponder/UnpackedTarball_mDNSResponder.mk @@ -0,0 +1,14 @@ +# -*- 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,mDNSResponder)) + +$(eval $(call gb_UnpackedTarball_set_tarball,mDNSResponder,$(MDNSRESPONDER_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk new file mode 100644 index 000000000..b03254845 --- /dev/null +++ b/external/misc_extensions/ExtensionPackageSet_misc_extensions.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/. +# + +$(eval $(call gb_ExtensionPackageSet_ExtensionPackageSet,misc_extensions)) + +ifneq ($(NUMBERTEXT_EXTENSION_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,numbertext,$(NUMBERTEXT_EXTENSION_PACK))) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/misc_extensions/Makefile b/external/misc_extensions/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/misc_extensions/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/misc_extensions/Module_misc_extensions.mk b/external/misc_extensions/Module_misc_extensions.mk new file mode 100644 index 000000000..86f65c2dd --- /dev/null +++ b/external/misc_extensions/Module_misc_extensions.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/. +# + +$(eval $(call gb_Module_Module,misc_extensions)) + +$(eval $(call gb_Module_add_targets,misc_extensions,\ + ExtensionPackageSet_misc_extensions \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/misc_extensions/README b/external/misc_extensions/README new file mode 100644 index 000000000..9c6fa2e54 --- /dev/null +++ b/external/misc_extensions/README @@ -0,0 +1 @@ +misc_extensions contains some extensions may be downloaded and bundled as-is diff --git a/external/more_fonts/ExternalPackage_EmojiOne_Color.mk b/external/more_fonts/ExternalPackage_EmojiOne_Color.mk new file mode 100644 index 000000000..76cdb6684 --- /dev/null +++ b/external/more_fonts/ExternalPackage_EmojiOne_Color.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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_emojione_color,font_emojione_color)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_emojione_color,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + EmojiOneColor-SVGinOT.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_alef.mk b/external/more_fonts/ExternalPackage_alef.mk new file mode 100644 index 000000000..f41aca483 --- /dev/null +++ b/external/more_fonts/ExternalPackage_alef.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_ExternalPackage_ExternalPackage,fonts_alef,font_alef)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_alef,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Alef-Bold.ttf \ + Alef-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_amiri.mk b/external/more_fonts/ExternalPackage_amiri.mk new file mode 100644 index 000000000..d938b8cf7 --- /dev/null +++ b/external/more_fonts/ExternalPackage_amiri.mk @@ -0,0 +1,20 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_amiri,font_amiri)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_amiri,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Amiri-Bold.ttf \ + Amiri-BoldSlanted.ttf \ + AmiriQuran.ttf \ + Amiri-Regular.ttf \ + Amiri-Slanted.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_caladea.mk b/external/more_fonts/ExternalPackage_caladea.mk new file mode 100644 index 000000000..9632a9d6b --- /dev/null +++ b/external/more_fonts/ExternalPackage_caladea.mk @@ -0,0 +1,19 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_caladea,font_caladea)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_caladea,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Caladea-Italic.ttf \ + Caladea-Regular.ttf \ + Caladea-BoldItalic.ttf \ + Caladea-Bold.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_carlito.mk b/external/more_fonts/ExternalPackage_carlito.mk new file mode 100644 index 000000000..1e09a554d --- /dev/null +++ b/external/more_fonts/ExternalPackage_carlito.mk @@ -0,0 +1,19 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_carlito,font_carlito)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_carlito,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Carlito-BoldItalic.ttf \ + Carlito-Regular.ttf \ + Carlito-Italic.ttf \ + Carlito-Bold.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_culmus.mk b/external/more_fonts/ExternalPackage_culmus.mk new file mode 100644 index 000000000..ecbd7f70e --- /dev/null +++ b/external/more_fonts/ExternalPackage_culmus.mk @@ -0,0 +1,33 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_culmus,font_culmus)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_culmus,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + DavidCLM-Bold.ttf \ + DavidCLM-BoldItalic.ttf \ + DavidCLM-Medium.ttf \ + DavidCLM-MediumItalic.ttf \ + FrankRuehlCLM-Bold.ttf \ + FrankRuehlCLM-BoldOblique.ttf \ + FrankRuehlCLM-Medium.ttf \ + FrankRuehlCLM-MediumOblique.ttf \ + MiriamCLM-Bold.ttf \ + MiriamCLM-Book.ttf \ + MiriamMonoCLM-Bold.ttf \ + MiriamMonoCLM-BoldOblique.ttf \ + MiriamMonoCLM-Book.ttf \ + MiriamMonoCLM-BookOblique.ttf \ + NachlieliCLM-Bold.otf \ + NachlieliCLM-BoldOblique.otf \ + NachlieliCLM-Light.otf \ + NachlieliCLM-LightOblique.otf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_dejavu.mk b/external/more_fonts/ExternalPackage_dejavu.mk new file mode 100644 index 000000000..981875ce7 --- /dev/null +++ b/external/more_fonts/ExternalPackage_dejavu.mk @@ -0,0 +1,37 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + ttf/DejaVuMathTeXGyre.ttf \ + ttf/DejaVuSans-Bold.ttf \ + ttf/DejaVuSans-BoldOblique.ttf \ + ttf/DejaVuSans-ExtraLight.ttf \ + ttf/DejaVuSans-Oblique.ttf \ + ttf/DejaVuSans.ttf \ + ttf/DejaVuSansCondensed-Bold.ttf \ + ttf/DejaVuSansCondensed-BoldOblique.ttf \ + ttf/DejaVuSansCondensed-Oblique.ttf \ + ttf/DejaVuSansCondensed.ttf \ + ttf/DejaVuSansMono-Bold.ttf \ + ttf/DejaVuSansMono-BoldOblique.ttf \ + ttf/DejaVuSansMono-Oblique.ttf \ + ttf/DejaVuSansMono.ttf \ + ttf/DejaVuSerif-Bold.ttf \ + ttf/DejaVuSerif-BoldItalic.ttf \ + ttf/DejaVuSerif-Italic.ttf \ + ttf/DejaVuSerif.ttf \ + ttf/DejaVuSerifCondensed-Bold.ttf \ + ttf/DejaVuSerifCondensed-BoldItalic.ttf \ + ttf/DejaVuSerifCondensed-Italic.ttf \ + ttf/DejaVuSerifCondensed.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_gentium.mk b/external/more_fonts/ExternalPackage_gentium.mk new file mode 100644 index 000000000..aa846271d --- /dev/null +++ b/external/more_fonts/ExternalPackage_gentium.mk @@ -0,0 +1,23 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + GenBasB.ttf \ + GenBasBI.ttf \ + GenBasI.ttf \ + GenBasR.ttf \ + GenBkBasB.ttf \ + GenBkBasBI.ttf \ + GenBkBasI.ttf \ + GenBkBasR.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_kacst.mk b/external/more_fonts/ExternalPackage_kacst.mk new file mode 100644 index 000000000..909ed1111 --- /dev/null +++ b/external/more_fonts/ExternalPackage_kacst.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_ExternalPackage_ExternalPackage,fonts_kacst,font_kacst)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_kacst,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + KacstBook.ttf \ + KacstOffice.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_liberation.mk b/external/more_fonts/ExternalPackage_liberation.mk new file mode 100644 index 000000000..a57207446 --- /dev/null +++ b/external/more_fonts/ExternalPackage_liberation.mk @@ -0,0 +1,27 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + LiberationMono-Bold.ttf \ + LiberationMono-BoldItalic.ttf \ + LiberationMono-Italic.ttf \ + LiberationMono-Regular.ttf \ + LiberationSans-Bold.ttf \ + LiberationSans-BoldItalic.ttf \ + LiberationSans-Italic.ttf \ + LiberationSans-Regular.ttf \ + LiberationSerif-Bold.ttf \ + LiberationSerif-BoldItalic.ttf \ + LiberationSerif-Italic.ttf \ + LiberationSerif-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_liberation_narrow.mk b/external/more_fonts/ExternalPackage_liberation_narrow.mk new file mode 100644 index 000000000..2fc52f3bb --- /dev/null +++ b/external/more_fonts/ExternalPackage_liberation_narrow.mk @@ -0,0 +1,19 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + LiberationSansNarrow-Bold.ttf \ + LiberationSansNarrow-BoldItalic.ttf \ + LiberationSansNarrow-Italic.ttf \ + LiberationSansNarrow-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_libertineg.mk b/external/more_fonts/ExternalPackage_libertineg.mk new file mode 100644 index 000000000..9c97b3ba3 --- /dev/null +++ b/external/more_fonts/ExternalPackage_libertineg.mk @@ -0,0 +1,25 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + LinBiolinum_RB_G.ttf \ + LinBiolinum_RI_G.ttf \ + LinBiolinum_R_G.ttf \ + LinLibertine_DR_G.ttf \ + LinLibertine_RBI_G.ttf \ + LinLibertine_RB_G.ttf \ + LinLibertine_RI_G.ttf \ + LinLibertine_RZI_G.ttf \ + LinLibertine_RZ_G.ttf \ + LinLibertine_R_G.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_libre_hebrew.mk b/external/more_fonts/ExternalPackage_libre_hebrew.mk new file mode 100644 index 000000000..ec2bd0024 --- /dev/null +++ b/external/more_fonts/ExternalPackage_libre_hebrew.mk @@ -0,0 +1,25 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_libre_hebrew,font_libre_hebrew)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libre_hebrew,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + DavidLibre-Bold.ttf \ + DavidLibre-Regular.ttf \ + FrankRuhlHofshi-Bold.otf \ + FrankRuhlHofshi-Regular.otf \ + MiriamLibre-Bold.otf \ + MiriamLibre-Regular.otf \ + Rubik-Bold.ttf \ + Rubik-BoldItalic.ttf \ + Rubik-Italic.ttf \ + Rubik-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk new file mode 100644 index 000000000..dd52ac956 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -0,0 +1,63 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_noto,font_noto)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoKufiArabic-Bold.ttf \ + NotoKufiArabic-Regular.ttf \ + NotoMono-Regular.ttf \ + NotoNaskhArabic-Bold.ttf \ + NotoNaskhArabic-Regular.ttf \ + NotoNaskhArabicUI-Bold.ttf \ + NotoNaskhArabicUI-Regular.ttf \ + NotoSansArabic-Bold.ttf \ + NotoSansArabic-Regular.ttf \ + NotoSansArabicUI-Bold.ttf \ + NotoSansArabicUI-Regular.ttf \ + NotoSansArmenian-Bold.ttf \ + NotoSansArmenian-Regular.ttf \ + NotoSans-Bold.ttf \ + NotoSans-BoldItalic.ttf \ + NotoSans-Condensed.ttf \ + NotoSans-CondensedBold.ttf \ + NotoSans-CondensedBoldItalic.ttf \ + NotoSans-CondensedItalic.ttf \ + NotoSansGeorgian-Bold.ttf \ + NotoSansGeorgian-Regular.ttf \ + NotoSansHebrew-Bold.ttf \ + NotoSansHebrew-Regular.ttf \ + NotoSans-Italic.ttf \ + NotoSansLao-Bold.ttf \ + NotoSansLao-Regular.ttf \ + NotoSans-Light.ttf \ + NotoSans-LightItalic.ttf \ + NotoSansLisu-Regular.ttf \ + NotoSans-Regular.ttf \ + NotoSerifArmenian-Bold.ttf \ + NotoSerifArmenian-Regular.ttf \ + NotoSerif-Bold.ttf \ + NotoSerif-BoldItalic.ttf \ + NotoSerif-Condensed.ttf \ + NotoSerif-CondensedBold.ttf \ + NotoSerif-CondensedBoldItalic.ttf \ + NotoSerif-CondensedItalic.ttf \ + NotoSerifGeorgian-Bold.ttf \ + NotoSerifGeorgian-Regular.ttf \ + NotoSerifHebrew-Bold.ttf \ + NotoSerifHebrew-Regular.ttf \ + NotoSerif-Italic.ttf \ + NotoSerifLao-Bold.ttf \ + NotoSerifLao-Regular.ttf \ + NotoSerif-Light.ttf \ + NotoSerif-LightItalic.ttf \ + NotoSerif-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_reem.mk b/external/more_fonts/ExternalPackage_reem.mk new file mode 100644 index 000000000..9a40652b5 --- /dev/null +++ b/external/more_fonts/ExternalPackage_reem.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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_reem,font_reem)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_reem,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + ttf/ReemKufi-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_scheherazade.mk b/external/more_fonts/ExternalPackage_scheherazade.mk new file mode 100644 index 000000000..8bf269e89 --- /dev/null +++ b/external/more_fonts/ExternalPackage_scheherazade.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_ExternalPackage_ExternalPackage,fonts_scheherazade,font_scheherazade)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_scheherazade,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + Scheherazade-Bold.ttf \ + Scheherazade-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_sourcecode.mk b/external/more_fonts/ExternalPackage_sourcecode.mk new file mode 100644 index 000000000..5f1d7f7c5 --- /dev/null +++ b/external/more_fonts/ExternalPackage_sourcecode.mk @@ -0,0 +1,29 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + SourceCodePro-BlackIt.ttf \ + SourceCodePro-Black.ttf \ + SourceCodePro-BoldIt.ttf \ + SourceCodePro-Bold.ttf \ + SourceCodePro-ExtraLightIt.ttf \ + SourceCodePro-ExtraLight.ttf \ + SourceCodePro-It.ttf \ + SourceCodePro-LightIt.ttf \ + SourceCodePro-Light.ttf \ + SourceCodePro-MediumIt.ttf \ + SourceCodePro-Medium.ttf \ + SourceCodePro-Regular.ttf \ + SourceCodePro-SemiboldIt.ttf \ + SourceCodePro-Semibold.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk new file mode 100644 index 000000000..cd7ac29e9 --- /dev/null +++ b/external/more_fonts/ExternalPackage_sourcesans.mk @@ -0,0 +1,27 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + SourceSansPro-BlackIt.ttf \ + SourceSansPro-Black.ttf \ + SourceSansPro-BoldIt.ttf \ + SourceSansPro-Bold.ttf \ + SourceSansPro-ExtraLightIt.ttf \ + SourceSansPro-ExtraLight.ttf \ + SourceSansPro-It.ttf \ + SourceSansPro-LightIt.ttf \ + SourceSansPro-Light.ttf \ + SourceSansPro-Regular.ttf \ + SourceSansPro-SemiboldIt.ttf \ + SourceSansPro-Semibold.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_sourceserif.mk b/external/more_fonts/ExternalPackage_sourceserif.mk new file mode 100644 index 000000000..6a5272bba --- /dev/null +++ b/external/more_fonts/ExternalPackage_sourceserif.mk @@ -0,0 +1,27 @@ +# -*- 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_ExternalPackage_ExternalPackage,fonts_sourceserif,font_sourceserif)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourceserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + SourceSerifPro-BoldIt.ttf \ + SourceSerifPro-ExtraLight.ttf \ + SourceSerifPro-Light.ttf \ + SourceSerifPro-Semibold.ttf \ + SourceSerifPro-BlackIt.ttf \ + SourceSerifPro-Bold.ttf \ + SourceSerifPro-It.ttf \ + SourceSerifPro-Regular.ttf \ + SourceSerifPro-Black.ttf \ + SourceSerifPro-ExtraLightIt.ttf \ + SourceSerifPro-LightIt.ttf \ + SourceSerifPro-SemiboldIt.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/Makefile b/external/more_fonts/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/more_fonts/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/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk new file mode 100644 index 000000000..c6e56c5b9 --- /dev/null +++ b/external/more_fonts/Module_more_fonts.mk @@ -0,0 +1,53 @@ +# -*- 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,more_fonts)) + +$(eval $(call gb_Module_add_targets,more_fonts,\ + ExternalPackage_alef \ + ExternalPackage_amiri \ + ExternalPackage_caladea \ + ExternalPackage_carlito \ + $(if $(MPL_SUBSET),,ExternalPackage_culmus) \ + ExternalPackage_dejavu \ + ExternalPackage_gentium \ + $(if $(MPL_SUBSET),,ExternalPackage_kacst) \ + ExternalPackage_liberation \ + ExternalPackage_liberation_narrow \ + ExternalPackage_libertineg \ + ExternalPackage_libre_hebrew \ + ExternalPackage_sourcecode \ + ExternalPackage_sourcesans \ + ExternalPackage_sourceserif \ + ExternalPackage_noto \ + ExternalPackage_reem \ + ExternalPackage_scheherazade \ + ExternalPackage_EmojiOne_Color \ + UnpackedTarball_alef \ + UnpackedTarball_amiri \ + UnpackedTarball_caladea \ + UnpackedTarball_carlito \ + $(if $(MPL_SUBSET),,UnpackedTarball_culmus) \ + UnpackedTarball_dejavu \ + UnpackedTarball_gentium \ + $(if $(MPL_SUBSET),,UnpackedTarball_kacst) \ + UnpackedTarball_liberation \ + UnpackedTarball_liberation_narrow \ + UnpackedTarball_libertineg \ + UnpackedTarball_libre_hebrew \ + UnpackedTarball_sourcecode \ + UnpackedTarball_sourcesans \ + UnpackedTarball_sourceserif \ + UnpackedTarball_noto \ + UnpackedTarball_reem \ + UnpackedTarball_scheherazade \ + UnpackedTarball_EmojiOne_Color \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/README b/external/more_fonts/README new file mode 100644 index 000000000..4a676e9f6 --- /dev/null +++ b/external/more_fonts/README @@ -0,0 +1 @@ +This module packages some external fonts.
\ No newline at end of file diff --git a/external/more_fonts/UnpackedTarball_EmojiOne_Color.mk b/external/more_fonts/UnpackedTarball_EmojiOne_Color.mk new file mode 100644 index 000000000..d931c7705 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_EmojiOne_Color.mk @@ -0,0 +1,14 @@ +# -*- 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,font_emojione_color)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_emojione_color,$(FONT_EMOJIONE_COLOR_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_alef.mk b/external/more_fonts/UnpackedTarball_alef.mk new file mode 100644 index 000000000..fbabe9fec --- /dev/null +++ b/external/more_fonts/UnpackedTarball_alef.mk @@ -0,0 +1,14 @@ +# -*- 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,font_alef)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_alef,$(FONT_ALEF_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_amiri.mk b/external/more_fonts/UnpackedTarball_amiri.mk new file mode 100644 index 000000000..75d0246b6 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_amiri.mk @@ -0,0 +1,14 @@ +# -*- 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,font_amiri)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_amiri,$(FONT_AMIRI_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_caladea.mk b/external/more_fonts/UnpackedTarball_caladea.mk new file mode 100644 index 000000000..7f5d65c12 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_caladea.mk @@ -0,0 +1,14 @@ +# -*- 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,font_caladea)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_caladea,$(FONT_CALADEA_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_carlito.mk b/external/more_fonts/UnpackedTarball_carlito.mk new file mode 100644 index 000000000..d14f29169 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_carlito.mk @@ -0,0 +1,14 @@ +# -*- 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,font_carlito)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_carlito,$(FONT_CARLITO_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_culmus.mk b/external/more_fonts/UnpackedTarball_culmus.mk new file mode 100644 index 000000000..3b776ed5c --- /dev/null +++ b/external/more_fonts/UnpackedTarball_culmus.mk @@ -0,0 +1,14 @@ +# -*- 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,font_culmus)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_culmus,$(FONT_CULMUS_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_dejavu.mk b/external/more_fonts/UnpackedTarball_dejavu.mk new file mode 100644 index 000000000..d7742df8c --- /dev/null +++ b/external/more_fonts/UnpackedTarball_dejavu.mk @@ -0,0 +1,14 @@ +# -*- 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,font_dejavu)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_dejavu,$(FONT_DEJAVU_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_gentium.mk b/external/more_fonts/UnpackedTarball_gentium.mk new file mode 100644 index 000000000..0827c0e23 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_gentium.mk @@ -0,0 +1,14 @@ +# -*- 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,font_gentium)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_gentium,$(FONT_GENTIUM_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_kacst.mk b/external/more_fonts/UnpackedTarball_kacst.mk new file mode 100644 index 000000000..7972da8d3 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_kacst.mk @@ -0,0 +1,14 @@ +# -*- 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,font_kacst)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_kacst,$(FONT_KACST_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_liberation.mk b/external/more_fonts/UnpackedTarball_liberation.mk new file mode 100644 index 000000000..8e428f55b --- /dev/null +++ b/external/more_fonts/UnpackedTarball_liberation.mk @@ -0,0 +1,14 @@ +# -*- 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,font_liberation)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_liberation,$(FONT_LIBERATION_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_liberation_narrow.mk b/external/more_fonts/UnpackedTarball_liberation_narrow.mk new file mode 100644 index 000000000..52e6f860b --- /dev/null +++ b/external/more_fonts/UnpackedTarball_liberation_narrow.mk @@ -0,0 +1,14 @@ +# -*- 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,font_liberation_narrow)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_liberation_narrow,$(FONT_LIBERATION_NARROW_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_libertineg.mk b/external/more_fonts/UnpackedTarball_libertineg.mk new file mode 100644 index 000000000..51610baa5 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_libertineg.mk @@ -0,0 +1,15 @@ +# -*- 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,font_libertineg)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_libertineg,$(FONT_LINLIBERTINEG_TARBALL))) + +# vim: set noet sw=4 ts=4: + diff --git a/external/more_fonts/UnpackedTarball_libre_hebrew.mk b/external/more_fonts/UnpackedTarball_libre_hebrew.mk new file mode 100644 index 000000000..1d6c56166 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_libre_hebrew.mk @@ -0,0 +1,14 @@ +# -*- 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,font_libre_hebrew)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_libre_hebrew,$(FONT_LIBRE_HEBREW_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_noto.mk b/external/more_fonts/UnpackedTarball_noto.mk new file mode 100644 index 000000000..ee6f223f8 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_noto.mk @@ -0,0 +1,14 @@ +# -*- 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,font_noto)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_noto,$(FONT_NOTO_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_reem.mk b/external/more_fonts/UnpackedTarball_reem.mk new file mode 100644 index 000000000..77e336539 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_reem.mk @@ -0,0 +1,14 @@ +# -*- 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,font_reem)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_reem,$(FONT_REEM_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_scheherazade.mk b/external/more_fonts/UnpackedTarball_scheherazade.mk new file mode 100644 index 000000000..b5b6f368f --- /dev/null +++ b/external/more_fonts/UnpackedTarball_scheherazade.mk @@ -0,0 +1,14 @@ +# -*- 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,font_scheherazade)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_scheherazade,$(FONT_SCHEHERAZADE_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_sourcecode.mk b/external/more_fonts/UnpackedTarball_sourcecode.mk new file mode 100644 index 000000000..7040e9b18 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_sourcecode.mk @@ -0,0 +1,14 @@ +# -*- 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,font_sourcecode)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_sourcecode,$(FONT_SOURCECODE_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_sourcesans.mk b/external/more_fonts/UnpackedTarball_sourcesans.mk new file mode 100644 index 000000000..65ff32553 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_sourcesans.mk @@ -0,0 +1,14 @@ +# -*- 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,font_sourcesans)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_sourcesans,$(FONT_SOURCESANS_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/UnpackedTarball_sourceserif.mk b/external/more_fonts/UnpackedTarball_sourceserif.mk new file mode 100644 index 000000000..0e8407320 --- /dev/null +++ b/external/more_fonts/UnpackedTarball_sourceserif.mk @@ -0,0 +1,14 @@ +# -*- 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,font_sourceserif)) + +$(eval $(call gb_UnpackedTarball_set_tarball,font_sourceserif,$(FONT_SOURCESERIF_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/fc_local.snippet b/external/more_fonts/fc_local.snippet new file mode 100644 index 000000000..cb49929b0 --- /dev/null +++ b/external/more_fonts/fc_local.snippet @@ -0,0 +1,29 @@ + <!-- Alias similar/metric-compatible families from various sources: --> + + <alias binding="same"> + <family>Liberation Sans Narrow</family> + <default> + <family>Arial Narrow</family> + </default> + </alias> + + <alias binding="same"> + <family>Arial Narrow</family> + <accept> + <family>Liberation Sans Narrow</family> + </accept> + </alias> + + <alias binding="same"> + <family>Calibri</family> + <accept> + <family>Carlito</family> + </accept> + </alias> + + <alias binding="same"> + <family>Cambria</family> + <accept> + <family>Caladea</family> + </accept> + </alias> diff --git a/external/msc-externals/Makefile b/external/msc-externals/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/msc-externals/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/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk new file mode 100644 index 000000000..07ea3878a --- /dev/null +++ b/external/msc-externals/Module_msc-externals.mk @@ -0,0 +1,29 @@ +# -*- 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,msc-externals)) + +ifneq ($(BUILD_X64),) + +$(eval $(call gb_Module_add_targets,msc-externals,\ + Package_msvc_dlls \ +)) + +endif + +# Install the universal crts (tdf#108580) +ifneq ($(UCRT_REDISTDIR),) + +$(eval $(call gb_Module_add_targets,msc-externals,\ + Package_ucrt \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/msc-externals/Package_msvc_dlls.mk b/external/msc-externals/Package_msvc_dlls.mk new file mode 100644 index 000000000..d82dd06c3 --- /dev/null +++ b/external/msc-externals/Package_msvc_dlls.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/. +# + +$(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH))) + +$(eval $(call gb_Package_add_files,msvc_dlls,program/shlxthdl,\ + $(MSVC_DLLS) \ +)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/msc-externals/Package_ucrt.mk b/external/msc-externals/Package_ucrt.mk new file mode 100644 index 000000000..52e6f0cba --- /dev/null +++ b/external/msc-externals/Package_ucrt.mk @@ -0,0 +1,21 @@ +# -*- 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_Package_Package,ucrt,$(UCRT_REDISTDIR))) + +$(eval $(call gb_Package_add_files,ucrt,$(LIBO_ETC_FOLDER),\ + Windows6.1-KB2999226-x64.msu \ + Windows6.1-KB2999226-x86.msu \ + Windows8.1-KB2999226-x64.msu \ + Windows8.1-KB2999226-x86.msu \ + Windows8-RT-KB2999226-x64.msu \ + Windows8-RT-KB2999226-x86.msu \ +)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/msc-externals/README b/external/msc-externals/README new file mode 100644 index 000000000..9ffb415c3 --- /dev/null +++ b/external/msc-externals/README @@ -0,0 +1 @@ +module msc-externals copies the bundled MSVC runtime DLLs into instdir diff --git a/external/mythes/ExternalProject_mythes.mk b/external/mythes/ExternalProject_mythes.mk new file mode 100644 index 000000000..b352e9b59 --- /dev/null +++ b/external/mythes/ExternalProject_mythes.mk @@ -0,0 +1,27 @@ +# -*- 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,mythes)) + +$(eval $(call gb_ExternalProject_use_external,mythes,hunspell)) + +$(eval $(call gb_ExternalProject_register_targets,mythes,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,mythes,build): + $(call gb_Trace_StartRange,mythes,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,mythes,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/mythes/Makefile b/external/mythes/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/mythes/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/mythes/Module_mythes.mk b/external/mythes/Module_mythes.mk new file mode 100644 index 000000000..56d95fc91 --- /dev/null +++ b/external/mythes/Module_mythes.mk @@ -0,0 +1,25 @@ +# -*- 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,mythes)) + +$(eval $(call gb_Module_add_targets,mythes,\ + UnpackedTarball_mythes \ +)) +ifeq ($(COM),MSC) +$(eval $(call gb_Module_add_targets,mythes,\ + StaticLibrary_mythes \ +)) +else +$(eval $(call gb_Module_add_targets,mythes,\ + ExternalProject_mythes \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/mythes/README b/external/mythes/README new file mode 100644 index 000000000..8a1792ee0 --- /dev/null +++ b/external/mythes/README @@ -0,0 +1 @@ +Library for handling thesaurus files from [http://hunspell.sourceforge.net]. diff --git a/external/mythes/StaticLibrary_mythes.mk b/external/mythes/StaticLibrary_mythes.mk new file mode 100644 index 000000000..74a9e07c4 --- /dev/null +++ b/external/mythes/StaticLibrary_mythes.mk @@ -0,0 +1,21 @@ +# -*- 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_StaticLibrary_StaticLibrary,mythes)) + +$(eval $(call gb_StaticLibrary_use_unpacked,mythes,mythes)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,mythes)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,mythes,\ + UnpackedTarball/mythes/mythes \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/external/mythes/UnpackedTarball_mythes.mk b/external/mythes/UnpackedTarball_mythes.mk new file mode 100644 index 000000000..cba16fd56 --- /dev/null +++ b/external/mythes/UnpackedTarball_mythes.mk @@ -0,0 +1,21 @@ +# -*- 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,mythes)) + +$(eval $(call gb_UnpackedTarball_set_tarball,mythes,$(MYTHES_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,mythes)) + +$(eval $(call gb_UnpackedTarball_add_patches,mythes,\ + external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \ + external/mythes/mythes-fdo48017-wfopen.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch b/external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch new file mode 100644 index 000000000..3752e2912 --- /dev/null +++ b/external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch @@ -0,0 +1,90 @@ +--- misc/mythes-1.2.3.orig/th_gen_idx.pl ++++ misc/build/mythes-1.2.3/th_gen_idx.pl +@@ -1,11 +1,25 @@ +-#!/usr/bin/perl +- +-# perl program to take a thesaurus structured text data file +-# and create the proper sorted index file (.idx) ++: ++eval 'exec perl -wS $0 ${1+"$@"}' ++ if 0; ++# ++# 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/. ++# ++# This file incorporates work covered by the following license notice: ++# ++# Licensed to the Apache Software Foundation (ASF) under one or more ++# contributor license agreements. See the NOTICE file distributed ++# with this work for additional information regarding copyright ++# ownership. The ASF licenses this file to you under the Apache ++# License, Version 2.0 (the "License"); you may not use this file ++# except in compliance with the License. You may obtain a copy of ++# the License at http://www.apache.org/licenses/LICENSE-2.0 . ++# + # +-# typically invoked as follows: +-# cat th_en_US_new.dat | ./th_gen_idx.pl > th_en_US_new.idx + # + + sub by_entry { + my ($aent, $aoff) = split('\|',$a); +@@ -13,6 +34,27 @@ sub by_entry { + $aent cmp $bent; + } + ++#FIXME: someone may want "infile" or even parameter parsing ++sub get_outfile { ++ my $next_is_file = 0; ++ foreach ( @ARGV ) { ++ if ( $next_is_file ) { ++ return $_ ++ } ++ if ( $_ eq "-o" ) { ++ $next_is_file = 1; ++ } ++ } ++ return ""; ++} ++ ++sub usage { ++ print "usage:\n"; ++ print "$0 -o outfile < input\n"; ++ ++ exit 99; ++} ++ + # main routine + my $ne = 0; # number of entries in index + my @tindex=(); # the index itself +@@ -24,6 +66,10 @@ my $nm=0; # number of meaning fo + my $meaning=""; # current meaning and synonyms + my $p; # misc uses + my $encoding; # encoding used by text file ++my $outfile = ""; ++ ++$outfile = get_outfile(); ++usage() if ( $outfile eq "" ); + + # top line of thesaurus provides encoding + $encoding=<STDIN>; +@@ -51,9 +97,13 @@ while ($rec=<STDIN>){ + # now we have all of the information + # so sort it and then output the encoding, count and index data + @tindex = sort by_entry @tindex; +-print STDOUT "$encoding\n"; +-print STDOUT "$ne\n"; ++ ++print "$outfile\n"; ++open OUTFILE, ">$outfile" or die "ERROR: Can't open $outfile for writing!"; ++print OUTFILE "$encoding\n"; ++print OUTFILE "$ne\n"; + foreach $one (@tindex) { +- print STDOUT "$one\n"; ++ print OUTFILE "$one\n"; + } ++close OUTFILE; + diff --git a/external/mythes/mythes-fdo48017-wfopen.patch b/external/mythes/mythes-fdo48017-wfopen.patch new file mode 100644 index 000000000..82d69ad66 --- /dev/null +++ b/external/mythes/mythes-fdo48017-wfopen.patch @@ -0,0 +1,77 @@ +diff -u mythes/mythes.cxx build/mythes/mythes.cxx +--- mythes/mythes.cxx 2014-05-22 00:27:38.508588487 +0200 ++++ build/mythes/mythes.cxx 2014-05-22 10:07:06.107547417 +0200 +@@ -8,6 +8,11 @@ + + #include "mythes.hxx" + ++#ifdef _WIN32 ++#include <windows.h> ++#include <wchar.h> ++#endif ++ + MyThes::MyThes(const char* idxpath, const char * datpath) + { + nw = 0; +@@ -35,7 +40,7 @@ + { + + // open the index file +- FILE * pifile = fopen(idxpath,"r"); ++ FILE * pifile = myfopen(idxpath,"r"); + if (!pifile) { + return 0; + } +@@ -90,7 +95,7 @@ + fclose(pifile); + + /* next open the data file */ +- pdfile = fopen(datpath,"r"); ++ pdfile = myfopen(datpath,"r"); + if (!pdfile) { + return 0; + } +@@ -373,3 +378,22 @@ + return -1; + } + ++FILE * MyThes::myfopen(const char * path, const char * mode) { ++#ifdef _WIN32 ++#define WIN32_LONG_PATH_PREFIX "\\\\?\\" ++ if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) { ++ int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0); ++ wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t)); ++ wchar_t *buff2 = (wchar_t *) malloc(len * sizeof(wchar_t)); ++ FILE * f = NULL; ++ MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len); ++ if (_wfullpath( buff2, buff, len ) != NULL) { ++ f = _wfopen(buff2, (strcmp(mode, "r") == 0) ? L"r" : L"rb"); ++ } ++ free(buff); ++ free(buff2); ++ return f; ++ } ++#endif ++ return fopen(path, mode); ++} +diff -u mythes/mythes.hxx build/mythes/mythes.hxx +--- mythes/mythes.hxx 2010-03-04 12:56:23.000000000 +0100 ++++ build/mythes/mythes.hxx 2014-05-22 10:11:14.363543731 +0200 +@@ -30,6 +30,7 @@ + MyThes & operator = (const MyThes &); + + public: ++ // use UTF-8 encoded paths in WIN32 environment + MyThes(const char* idxpath, const char* datpath); + ~MyThes(); + +@@ -66,6 +67,9 @@ + // return index of char in string + int mystr_indexOfChar(const char * d, int c); + ++ // fopen or _wfopen ++ FILE * myfopen(const char * path, const char * mode); ++ + }; + + #endif diff --git a/external/neon/Library_neon.mk b/external/neon/Library_neon.mk new file mode 100644 index 000000000..4c034a317 --- /dev/null +++ b/external/neon/Library_neon.mk @@ -0,0 +1,100 @@ +# -*- 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_Library_Library,neon)) + +$(eval $(call gb_Library_use_unpacked,neon,neon)) + +$(eval $(call gb_Library_use_externals,neon,\ + gnutls \ + libxml2 \ + libgcrypt \ + openssl \ + openssl_headers \ + zlib \ +)) + +$(eval $(call gb_Library_set_visibility_default,neon)) + +$(eval $(call gb_Library_set_warnings_disabled,neon)) + +$(eval $(call gb_Library_add_generated_cobjects,neon,\ + UnpackedTarball/neon/src/ne_207 \ + UnpackedTarball/neon/src/ne_acl3744 \ + UnpackedTarball/neon/src/ne_alloc \ + UnpackedTarball/neon/src/ne_auth \ + UnpackedTarball/neon/src/ne_basic \ + UnpackedTarball/neon/src/ne_compress \ + UnpackedTarball/neon/src/ne_dates \ + UnpackedTarball/neon/src/ne_i18n \ + UnpackedTarball/neon/src/ne_locks \ + UnpackedTarball/neon/src/ne_md5 \ + UnpackedTarball/neon/src/ne_props \ + UnpackedTarball/neon/src/ne_redirect \ + UnpackedTarball/neon/src/ne_request \ + UnpackedTarball/neon/src/ne_session \ + UnpackedTarball/neon/src/ne_socket \ + UnpackedTarball/neon/src/ne_socks \ + UnpackedTarball/neon/src/ne_string \ + UnpackedTarball/neon/src/ne_uri \ + UnpackedTarball/neon/src/ne_utils \ + UnpackedTarball/neon/src/ne_xml \ + UnpackedTarball/neon/src/ne_xmlreq \ +)) + + +ifneq ($(DISABLE_OPENSSL),TRUE) +$(eval $(call gb_Library_add_generated_cobjects,neon,\ + UnpackedTarball/neon/src/ne_openssl \ +)) +else +$(eval $(call gb_Library_add_generated_cobjects,neon,\ + UnpackedTarball/neon/src/ne_gnutls \ +)) +endif + + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_use_system_win32_libs,neon,\ + ws2_32 \ + crypt32 \ +)) + +ifeq ($(COM),MSC) +$(eval $(call gb_Library_add_ldflags,neon,\ + /DEF:$(SRCDIR)/external/neon/neon.def \ +)) +endif + +$(eval $(call gb_Library_add_generated_cobjects,neon,\ + UnpackedTarball/neon/src/ne_sspi \ +)) + +else +ifneq ($(DISABLE_OPENSSL),TRUE) +$(eval $(call gb_Library_add_generated_cobjects,neon,\ + UnpackedTarball/neon/src/ne_ntlm \ +)) +endif + +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_libs,neon,\ + -ldl \ +)) +endif + +ifneq (,$(gb_ENABLE_DBGUTIL)) +$(eval $(call gb_Library_add_cflags,neon,\ + -DNE_DEBUGGING \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/neon/Makefile b/external/neon/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/neon/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/neon/Module_neon.mk b/external/neon/Module_neon.mk new file mode 100644 index 000000000..cc2e0cb5e --- /dev/null +++ b/external/neon/Module_neon.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,neon)) + +$(eval $(call gb_Module_add_targets,neon,\ + Library_neon \ + UnpackedTarball_neon \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/neon/README b/external/neon/README new file mode 100644 index 000000000..e983ae822 --- /dev/null +++ b/external/neon/README @@ -0,0 +1 @@ +Web library to help deal with WebDAV or other protocols, from [https://notroj.github.io/neon/]. diff --git a/external/neon/UnpackedTarball_neon.mk b/external/neon/UnpackedTarball_neon.mk new file mode 100644 index 000000000..e12d13b6a --- /dev/null +++ b/external/neon/UnpackedTarball_neon.mk @@ -0,0 +1,36 @@ +# -*- 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,neon)) + +$(eval $(call gb_UnpackedTarball_set_tarball,neon,$(NEON_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_files,neon,src,\ + external/neon/configs/config.h \ +)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,neon,0)) + +# For the upstream discussion of neon_uri_parse_allow_others.patch see +# http://lists.manyfish.co.uk/pipermail/neon/2020-February/001629.html +# or thread "RfC: Accept SharePoint href IRIs" + +$(eval $(call gb_UnpackedTarball_add_patches,neon,\ + external/neon/neon.patch \ + external/neon/neon_ne_set_request_flag.patch \ + external/neon/neon_with_gnutls.patch \ + external/neon/ubsan.patch \ + external/neon/neon_fix_lock_token_on_if.patch \ + external/neon/neon_fix_lock_timeout_windows.patch \ + external/neon/neon_fix_sspi_session_timeout.patch \ + external/neon/neon_uri_parse_allow_others.patch \ + $(if $(filter WNT,$(OS)),external/neon/neon_fix_no_OPENSSL_Applink.patch) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h new file mode 100644 index 000000000..00252d0ab --- /dev/null +++ b/external/neon/configs/config.h @@ -0,0 +1,597 @@ +/* Contents kept in sync with config.h.in from neon 0.29.5 */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define to specific EGD socket path */ +/* #undef EGD_PATH */ + +/* Define if EGD should be supported */ +/* #undef ENABLE_EGD */ + +/* Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise */ +/* #undef GSS_C_NT_HOSTBASED_SERVICE */ + +/* Define to 1 if you have the <arpa/inet.h> header file. */ +#ifdef UNX +#define HAVE_ARPA_INET_H 1 +#endif + +/* Define to 1 if you have the `bind_textdomain_codeset' function. */ +/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */ + +/* Define to 1 if you have the `CRYPTO_set_idptr_callback' function. */ +/* #undef HAVE_CRYPTO_SET_IDPTR_CALLBACK */ + +/* Define to 1 if you have the declaration of `h_errno', and to 0 if you + don't. */ +#ifdef _WIN32 +#define HAVE_DECL_H_ERRNO 1 +#endif + +/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't. + */ +#ifdef LINUX +#define HAVE_DECL_STPCPY 1 +#endif + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ +#ifdef LINUX +#define HAVE_DECL_STRERROR_R 1 +#endif + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#ifdef UNX +#define HAVE_DLFCN_H 1 +#endif + +/* Define to 1 if you have the <errno.h> header file. */ +#define HAVE_ERRNO_H 1 + +/* Define if you have expat */ +/* #undef HAVE_EXPAT */ + +/* Define to 1 if you have the `fcntl' function. */ +#ifdef UNX +#define HAVE_FCNTL 1 +#endif + +/* Define to 1 if you have the <fcntl.h> header file. */ +#ifdef UNX +#define HAVE_FCNTL_H 1 +#endif + +/* Define to 1 if you have the `fstat64' function. */ +#define HAVE_FSTAT64 + +/* Define to 1 if you have the `gai_strerror' function. */ +#define HAVE_GAI_STRERROR 1 + +/* Define to 1 if you have the `gethostname' function. */ +/* #undef HAVE_GETHOSTNAME */ + +/* Define to 1 if you have the `getnameinfo' function. */ +/* #undef HAVE_GETNAMEINFO */ + +/* Define to 1 if you have the `getsockopt' function. */ +#ifdef UNX +#define HAVE_GETSOCKOPT 1 +#endif + +#ifdef DISABLE_OPENSSL +/* Define if GnuTLS support is enabled */ +#define HAVE_GNUTLS + +/* Define to 1 if you have the `gnutls_certificate_get_x509_cas' function. */ +/* #undef HAVE_GNUTLS_CERTIFICATE_GET_X509_CAS */ + +/* Define to 1 if you have the `gnutls_certificate_verify_peers2' function. */ +#define HAVE_GNUTLS_CERTIFICATE_VERIFY_PEERS2 + +/* Define to 1 if you have the `gnutls_session_get_data2' function. */ +#define HAVE_GNUTLS_SESSION_GET_DATA2 + +/* Define to 1 if you have the `gnutls_sign_callback_set' function. */ +#define HAVE_GNUTLS_SIGN_CALLBACK_SET + +/* Define to 1 if you have the `gnutls_x509_dn_get_rdn_ava' function. */ +#define HAVE_GNUTLS_X509_DN_GET_RDN_AVA +#endif /* DISABLE_OPENSSL */ + +/* Define if GSSAPI support is enabled */ +/* #undef HAVE_GSSAPI */ + +/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */ + +/* Define to 1 if you have the <gssapi/gssapi.h> header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_H */ + +/* Define to 1 if you have the <gssapi.h> header file. */ +/* #undef HAVE_GSSAPI_H */ + +/* Define to 1 if you have the `gss_init_sec_context' function. */ +/* #undef HAVE_GSS_INIT_SEC_CONTEXT */ + +/* Define to 1 if you have the `hstrerror' function. */ +/* #undef HAVE_HSTRERROR */ + +/* Define to 1 if you have the `iconv' function. */ +/* #undef HAVE_ICONV */ + +/* Define to 1 if you have the <iconv.h> header file. */ +/* #undef HAVE_ICONV_H */ + +/* Define to 1 if you have the `inet_ntop' function. */ +#ifdef UNX +#define HAVE_INET_NTOP 1 +#endif + +/* Define to 1 if you have the `inet_pton' function. */ +/* #undef HAVE_INET_PTON */ + +/* Define to 1 if you have the <inttypes.h> header file. */ +#ifdef UNX +#define HAVE_INTTYPES_H 1 +#endif + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the <libintl.h> header file. */ +/* #undef HAVE_LIBINTL_H */ + +/* Define if libproxy is supported */ +/* #undef HAVE_LIBPROXY */ + +/* Define if you have libxml */ +#define HAVE_LIBXML 1 + +/* Define to 1 if you have the <libxml/parser.h> header file. */ +#define HAVE_LIBXML_PARSER_H 1 + +/* Define to 1 if you have the <libxml/xmlversion.h> header file. */ +#define HAVE_LIBXML_XMLVERSION_H 1 + +/* Define to 1 if you have the <limits.h> header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the <locale.h> header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have the `lseek64' function. */ +#define HAVE_LSEEK64 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the <netdb.h> header file. */ +#ifdef UNX +#define HAVE_NETDB_H 1 +#endif + +/* Define to 1 if you have the <netinet/in.h> header file. */ +#ifdef UNX +#define HAVE_NETINET_IN_H 1 +#endif + +/* Define to 1 if you have the <netinet/tcp.h> header file. */ +#ifdef UNX +#define HAVE_NETINET_TCP_H 1 +#endif + +#ifndef DISABLE_OPENSSL +/* Define if NTLM is supported */ +#ifndef _WIN32 +#define HAVE_NTLM 1 +#endif + +/* Define if OpenSSL support is enabled */ +#define HAVE_OPENSSL 1 + +/* Define to 1 if you have the <openssl/opensslv.h> header file. */ +#define HAVE_OPENSSL_OPENSSLV_H 1 + +/* Define to 1 if you have the <openssl/ssl.h> header file. */ +#define HAVE_OPENSSL_SSL_H 1 +#endif /* !DISABLE_OPENSSL */ + +/* Define if pakchois library supported */ +/* #undef HAVE_PAKCHOIS */ + +/* Define to 1 if you have the `pipe' function. */ +#define HAVE_PIPE 1 + +/* Define to 1 if you have the `poll' function. */ +#define HAVE_POLL 1 + +/* Define to 1 if you have the `pthread_mutex_init' function. */ +/* #undef HAVE_PTHREAD_MUTEX_INIT */ + +/* Define to 1 if you have the `pthread_mutex_lock' function. */ +/* #undef HAVE_PTHREAD_MUTEX_LOCK */ + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the `setsockopt' function. */ +#if defined(LINUX) || defined(_WIN32) +#define HAVE_SETSOCKOPT 1 +#endif + +/* Define to 1 if you have the `setvbuf' function. */ +#define HAVE_SETVBUF 1 + +/* Define to 1 if you have the `shutdown' function. */ +#ifdef LINUX +#define HAVE_SHUTDOWN 1 +#endif + +/* Define to 1 if you have the `signal' function. */ +#define HAVE_SIGNAL 1 + +/* Define to 1 if you have the <signal.h> header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `snprintf' function. */ +#if defined(UNX) || defined(_MSC_VER) +#define HAVE_SNPRINTF 1 +#endif + +/* Define to 1 if the system has the type `socklen_t'. */ +#ifdef UNX +#define HAVE_SOCKLEN_T 1 +#endif + +/* Define to 1 if you have the `SSL_SESSION_cmp' function. */ +/* #undef HAVE_SSL_SESSION_CMP */ + +/* Define to 1 if you have the <stdarg.h> header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `stpcpy' function. */ +#ifdef LINUX +#define HAVE_STPCPY 1 +#endif + +/* Define to 1 if you have the `strcasecmp' function. */ +#ifdef UNX +#define HAVE_STRCASECMP 1 +#endif + +#ifdef _WIN32 +#define strcasecmp strcmpi +#endif + +/* Define to 1 if you have the `strerror_r' function. */ +#ifdef LINUX +#define HAVE_STRERROR_R 1 +#endif + +/* Define to 1 if you have the <strings.h> header file. */ +#ifdef UNX +#define HAVE_STRINGS_H 1 +#endif + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strtoll' function. */ +#define HAVE_STRTOLL 1 + +/* Define to 1 if you have the `strtoq' function. */ +/* #undef HAVE_STRTOQ */ + +/* Define to 1 if `tm_gmtoff' is member of `struct tm'. */ +#ifdef LINUX +#define HAVE_STRUCT_TM_TM_GMTOFF 1 +#endif + +/* Define to 1 if `__tm_gmtoff' is member of `struct tm'. */ +/* #undef HAVE_STRUCT_TM___TM_GMTOFF */ + +/* Define to 1 if you have the <sys/limits.h> header file. */ +/* #undef HAVE_SYS_LIMITS_H */ + +/* Define to 1 if you have the <sys/poll.h> header file. */ +#ifdef UNX +#define HAVE_SYS_POLL_H 1 +#endif + +/* Define to 1 if you have the <sys/select.h> header file. */ +#ifdef UNX +#define HAVE_SYS_SELECT_H 1 +#endif + +/* Define to 1 if you have the <sys/socket.h> header file. */ +#ifdef UNX +#define HAVE_SYS_SOCKET_H 1 +#endif + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/time.h> header file. */ +#ifdef UNX +#define HAVE_SYS_TIME_H 1 +#endif + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if the timezone global is available */ +#ifndef MACOSX +#define HAVE_TIMEZONE 1 +#if defined(_MSC_VER) +#define timezone _timezone +#endif +#endif + +/* Use trio printf replacement library */ +/* #undef HAVE_TRIO */ + +/* Define to 1 if you have the <trio.h> header file. */ +/* #undef HAVE_TRIO_H */ + +/* Define to 1 if you have the <unistd.h> header file. */ +#ifdef UNX +#define HAVE_UNISTD_H 1 +#endif + +/* Define to 1 if you have the `usleep' function. */ +#ifdef UNX +#define HAVE_USLEEP 1 +#endif + +/* Define to 1 if you have the `vsnprintf' function. */ +#if defined(UNX) || defined(_MSC_VER) +#define HAVE_VSNPRINTF 1 +#endif + +#ifdef __MINGW32__ +#define vsnprintf _vsnprintf +#endif + +/* Define to be location of localedir */ +/* #undef LOCALEDIR */ + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +/* #undef LT_OBJDIR */ + +/* Defined when neon is built as a library */ +#define NEON_IS_LIBRARY 1 + +/* Define to be the neon version string */ +#define NEON_VERSION "0.29.5" + +/* Define to enable debugging */ +/* #undef NE_DEBUGGING */ + +/* Define to be printf format string for ne_off_t */ +/* #undef NE_FMT_NE_OFF_T */ + +/* Define to be printf format string for off64_t */ +#define NE_FMT_OFF64_T "lld" + +/* Define to be printf format string for off_t */ +#define NE_FMT_OFF_T "ld" + +/* Define to be printf format string for size_t */ +#define NE_FMT_SIZE_T "u" + +/* Define to be printf format string for ssize_t */ +#define NE_FMT_SSIZE_T "d" + +/* Define to be printf format string for time_t */ +#define NE_FMT_TIME_T "ld" + +/* Define to be printf format string for XML_Size */ +/* #undef NE_FMT_XML_SIZE */ + +/* Defined if DAV is supported */ +#define NE_HAVE_DAV 1 + +/* Defined if I18N is supported */ +/* #undef NE_HAVE_I18N */ + +/* Defined if IPV6 is supported */ +#define NE_HAVE_IPV6 1 + +/* Defined if LFS is supported */ +#define NE_HAVE_LFS 1 + +/* Defined if LIBPXY is supported */ +/* #undef NE_HAVE_LIBPXY */ + +/* Defined if SSL is supported */ +#define NE_HAVE_SSL + +/* Defined if TS_SSL is supported */ +/* #undef NE_HAVE_TS_SSL */ + +/* Defined if ZLIB is supported */ +#define NE_HAVE_ZLIB 1 + +/* Define to be filename of an SSL CA root bundle */ +/* #undef NE_SSL_CA_BUNDLE */ + +/* Define if poll() should be used */ +#ifdef UNX +#define NE_USE_POLL 1 +#endif + +/* Define to be neon library major version */ +#define NE_VERSION_MAJOR (0) + +/* Define to be neon library minor version */ +#define NE_VERSION_MINOR (29) + +/* Define to be neon library patch version */ +#define NE_VERSION_PATCH (5) + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "neon@webdav.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "neon" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "neon 0.29.5" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "neon" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.29.5" + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of `off64_t', as computed by sizeof. */ +#define SIZEOF_OFF64_T 8 + +/* The size of `off_t', as computed by sizeof. */ +#define SIZEOF_OFF_T 4 + +/* The size of `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 4 + +/* The size of `ssize_t', as computed by sizeof. */ +#define SIZEOF_SSIZE_T 4 + +/* The size of `time_t', as computed by sizeof. */ +#define SIZEOF_TIME_T 4 + +/* The size of `XML_Size', as computed by sizeof. */ +/* #undef SIZEOF_XML_SIZE */ + +/* Define to 1 if you have the ANSI C header files. */ +#ifdef __sun +#define STDC_HEADERS 1 +#endif + +/* Define to 1 if strerror_r returns char *. */ +#ifdef LINUX +#define STRERROR_R_CHAR_P 1 +#endif + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +#define TIME_WITH_SYS_TIME 1 + +/* Define if getaddrinfo supports AI_ADDRCONFIG */ +/* #undef USE_GAI_ADDRCONFIG */ + +/* Define if getaddrinfo() should be used */ +#define USE_GETADDRINFO 1 + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +#undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +#undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +#undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +#undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +#undef __EXTENSIONS__ +#endif + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined(__sun) && defined(SPARC) +#define WORDS_BIGENDIAN 1 +#endif + +/* Always defined to enable GNU extensions */ +#define _GNU_SOURCE 1 + +/* Define to 1 if on MINIX. */ +/* #undef _MINIX */ + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +/* #undef _POSIX_SOURCE */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define if in_addr_t is not available */ +/* #undef in_addr_t */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#if defined(__sun) && defined(__SUNPRO_C) +#define inline +#endif +#endif + +/* Define to `long int' if <sys/types.h> does not define. */ +/* #undef off_t */ + +/* Define to `int' if <sys/types.h> does not define. */ +/* #undef pid_t */ + +/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* #undef size_t */ + +/* Define if socklen_t is not available */ +/* #undef socklen_t */ + +/* MS IIS does not send Lock-Token response header after creation of a */ +/* new lock. This violates RFC, but... if we want to talk with this */ +/* beast we need a workaround */ +#define IIS_LOCK_BUG_WORKAROUND 1 + +/* Enable leak-tracking versions of ne_*alloc when NEON_MEMLEAK is enabled */ +#ifdef NEON_MEMLEAK +#include "memleak.h" +#endif + +#if defined(HAVE_STPCPY) && defined(HAVE_DECL_STPCPY) && !HAVE_DECL_STPCPY && !defined(stpcpy) +char* stpcpy(char*, const char*); +#endif + +#ifdef _WIN32 + +#include <io.h> + +#define HAVE_MEMCPY 1 + +#define strncasecmp strnicmp +#define inline __inline +#define WIN32_LEAN_AND_MEAN +#define NOUSER +#define NOGDI +#define NONLS +#define NOCRYPT + +#define HAVE_SSPI 1 + +#endif diff --git a/external/neon/neon.def b/external/neon/neon.def new file mode 100644 index 000000000..3a14d66fb --- /dev/null +++ b/external/neon/neon.def @@ -0,0 +1,292 @@ +LIBRARY "neon.dll" +HEAPSIZE 0 +EXPORTS + ne_sspi_authenticate; + ne_sspi_clear_context; + ne_sspi_create_context; + ne_sspi_deinit; + ne_sspi_destroy_context; + ne_sspi_init; + ne__negotiate_ssl; + ne__ssl_exit; + ne__ssl_init; + ne_ssl_cert_cmp; + ne_ssl_cert_digest; + ne_ssl_cert_export; + ne_ssl_cert_free; + ne_ssl_cert_identity; + ne_ssl_cert_import; + ne_ssl_cert_issuer; + ne_ssl_cert_read; + ne_ssl_cert_signedby; + ne_ssl_cert_subject; + ne_ssl_cert_validity_time; + ne_ssl_cert_write; + ne_ssl_clicert_decrypt; + ne_ssl_clicert_encrypted; + ne_ssl_clicert_free; + ne_ssl_clicert_name; + ne_ssl_clicert_owner; + ne_ssl_clicert_read; + ne_ssl_context_create; + ne_ssl_context_destroy; + ne_ssl_context_keypair; + ne_ssl_context_set_flag; + ne_ssl_context_set_verify; + ne_ssl_context_trustcert; + ne_ssl_dname_cmp; + ne_ssl_readable_dname; + ne_ssl_set_clicert; + ne_ssl_trust_default_ca; + ne_xml_dispatch_request; + ne_xml_parse_response; + ne_xml_create; + ne_xml_currentline; + ne_xml_destroy; + ne_xml_doc_encoding; + ne_xml_failed; + ne_xml_get_attr; + ne_xml_get_error; + ne_xml_mapid; + ne_xml_parse; + ne_xml_parse_v; + ne_xml_push_handler; + ne_xml_resolve_nspace; + ne_xml_set_error; + ne_debug; + ne_debug_init; + ne_debug_mask; + ne_debug_stream; + ne_has_support; + ne_parse_statusline; + ne_version_match; + ne_version_string; + ne_path_childof; + ne_path_compare; + ne_path_escape; + ne_path_has_trailing_slash; + ne_path_parent; + ne_path_unescape; + ne_uri_cmp; + ne_uri_copy; + ne_uri_defaultport; + ne_uri_free; + ne_uri_parse; + ne_uri_resolve; + ne_uri_unparse; + ne_base64; + ne_buffer_altered; + ne_buffer_append; + ne_buffer_clear; + ne_buffer_concat; + ne_buffer_create; + ne_buffer_destroy; + ne_buffer_finish; + ne_buffer_grow; + ne_buffer_ncreate; + ne_buffer_snprintf; + ne_buffer_zappend; + ne_concat; + ne_qtoken; + ne_shave; + ne_snprintf; + ne_strcasecmp; + ne_strclean; + ne_strerror; + ne_strncasecmp; + ne_token; + ne_tolower_array; + ne_unbase64; + ne_vsnprintf; + ne__sock_sslsock; + ne_addr_destroy; + ne_addr_error; + ne_addr_first; + ne_addr_next; + ne_addr_resolve; + ne_addr_result; + ne_iaddr_cmp; + ne_iaddr_free; + ne_iaddr_make; + ne_iaddr_print; + ne_iaddr_reverse; + ne_iaddr_typeof; + ne_sock_accept; + ne_sock_accept_ssl; + ne_sock_block; + ne_sock_cipher; + ne_sock_close; + ne_sock_connect; + ne_sock_connect_ssl; + ne_sock_connect_timeout; + ne_sock_create; + ne_sock_error; + ne_sock_exit; + ne_sock_fd; + ne_sock_fullread; + ne_sock_fullwrite; + ne_sock_init; + ne_sock_peek; + ne_sock_peer; + ne_sock_prebind; + ne_sock_proxy; + ne_sock_read; + ne_sock_read_timeout; + ne_sock_readline; + ne_sock_sessid; + ne__ssl_set_verify_err; + ne_close_connection; + ne_fill_proxy_uri; + ne_fill_server_uri; + ne_get_error; + ne_get_scheme; + ne_get_server_hostport; + ne_get_session_flag; + ne_hook_close_conn; + ne_hook_create_request; + ne_hook_destroy_request; + ne_hook_destroy_session; + ne_hook_post_headers; + ne_hook_post_send; + ne_hook_pre_send; + ne_session_create; + ne_session_destroy; + ne_session_proxy; + ne_set_addrlist; + ne_set_connect_timeout; + ne_set_error; + ne_set_localaddr; + ne_set_notifier; + ne_set_progress; + ne_set_read_timeout; + ne_set_session_flag; + ne_set_session_private; + ne_set_useragent; + ne_ssl_cert_validity; + ne_ssl_provide_clicert; + ne_ssl_set_verify; + ne_ssl_trust_cert; + ne_unhook_close_conn; + ne_unhook_create_request; + ne_unhook_destroy_request; + ne_unhook_destroy_session; + ne_unhook_post_headers; + ne_unhook_post_send; + ne_unhook_pre_send; + ne_version_pre_http11; + ne_accept_2xx; + ne_accept_always; + ne_add_request_header; + ne_add_response_body_reader; + ne_begin_request; + ne_discard_response; + ne_end_request; + ne_get_request_flag; + ne_get_request_private; + ne_get_response_header; + ne_get_session; + ne_get_session_private; + ne_get_status; + ne_print_request_header; + ne_read_response_block; + ne_read_response_to_fd; + ne_request_create; + ne_request_destroy; + ne_request_dispatch; + ne_response_header_iterate; + ne_set_request_body_buffer; + ne_set_request_body_fd; + ne_set_request_body_provider; + ne_set_request_flag; + ne_set_request_private; + ne_redirect_location; + ne_redirect_register; + ne_propfind_allprop; + ne_propfind_create; + ne_propfind_current_private; + ne_propfind_destroy; + ne_propfind_get_parser; + ne_propfind_get_request; + ne_propfind_named; + ne_propfind_set_private; + ne_propnames; + ne_proppatch; + ne_propset_iterate; + ne_propset_lang; + ne_propset_private; + ne_propset_status; + ne_propset_value; + ne_simple_propfind; + ne_ascii_to_md5; + ne_md5_create_ctx; + ne_md5_destroy_ctx; + ne_md5_dup_ctx; + ne_md5_finish_ascii; + ne_md5_finish_ctx; + ne_md5_process_block; + ne_md5_process_bytes; + ne_md5_read_ctx; + ne_md5_reset_ctx; + ne_md5_stream; + ne_md5_to_ascii; + ne_lock; + ne_lock_copy; + ne_lock_create; + ne_lock_destroy; + ne_lock_discover; + ne_lock_free; + ne_lock_refresh; + ne_lock_using_parent; + ne_lock_using_resource; + ne_lockstore_add; + ne_lockstore_create; + ne_lockstore_destroy; + ne_lockstore_findbyuri; + ne_lockstore_first; + ne_lockstore_next; + ne_lockstore_register; + ne_lockstore_remove; + ne_unlock; + ne_i18n_init; + ne_asctime_parse; + ne_httpdate_parse; + ne_iso8601_parse; + ne_rfc1036_parse; + ne_rfc1123_date; + ne_rfc1123_parse; + ne_decompress_destroy; + ne_decompress_reader; + ne_add_depth_header; + ne_copy; + ne_delete; + ne_get; + ne_get_content_type; + ne_get_range; + ne_getmodtime; + ne_mkcol; + ne_move; + ne_options; + ne_options2; + ne_post; + ne_put; + ne_add_proxy_auth; + ne_add_server_auth; + ne_forget_auth; + ne_set_proxy_auth; + ne_set_server_auth; + ne_calloc; + ne_malloc; + ne_oom_callback; + ne_realloc; + ne_strdup; + ne_strndup; + ne_free; + ne_acl3744_set; + ne_207_create; + ne_207_destroy; + ne_207_get_current_propstat; + ne_207_get_current_response; + ne_207_set_propstat_handlers; + ne_207_set_response_handlers; + ne_accept_207; + ne_simple_request; diff --git a/external/neon/neon.patch b/external/neon/neon.patch new file mode 100644 index 000000000..fe106eaa1 --- /dev/null +++ b/external/neon/neon.patch @@ -0,0 +1,311 @@ +--- src/ne_auth.c 2010-10-14 17:00:53.000000000 +0200 ++++ src/ne_auth.c 2011-02-03 10:31:22.000000000 +0100 +@@ -367,7 +367,7 @@ + static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt, + struct auth_challenge *chall, char *pwbuf) + { +- if (chall->handler->creds(chall->handler->userdata, sess->realm, ++ if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm, + chall->handler->attempt++, sess->username, pwbuf) == 0) { + return 0; + } else { +@@ -385,15 +385,19 @@ + { + char *tmp, password[NE_ABUFSIZ]; + ++#if 0 /* Workaround - IIS sends challenge without realm. */ ++ + /* Verify challenge... must have a realm */ + if (parms->realm == NULL) { + challenge_error(errmsg, _("missing realm in Basic challenge")); + return -1; + } ++#endif + + clean_session(sess); + +- sess->realm = ne_strdup(parms->realm); ++ if (parms->realm != NULL) ++ sess->realm = ne_strdup(parms->realm); + + if (get_credentials(sess, errmsg, attempt, parms, password)) { + /* Failed to get credentials */ +@@ -610,10 +614,12 @@ + return NULL; + } + +-static int continue_sspi(auth_session *sess, int ntlm, const char *hdr) ++static int continue_sspi(auth_session *sess, int ntlm, const char *hdr, ++ int attempt, struct auth_challenge *parms, ne_buffer **errmsg) + { + int status; + char *response = NULL; ++ char password[NE_ABUFSIZ]; + + NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n"); + +@@ -630,8 +636,17 @@ + return status; + } + } +- +- status = ne_sspi_authenticate(sess->sspi_context, hdr, &response); ++ ++ /* Authentification needs more than one http request. ++ * As long as authentification in progress use the existing credentials. ++ * Otherwise get new credentials.*/ ++ if (!hdr) ++ if (get_credentials(sess, errmsg, attempt, parms, password)) { ++ /* Failed to get credentials */ ++ return -1; ++ } ++ ++ status = ne_sspi_authenticate(sess->sspi_context, hdr, &response, sess->username, password); + if (status) { + return status; + } +@@ -651,7 +666,7 @@ + { + int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0; + +- return continue_sspi(sess, ntlm, parms->opaque); ++ return continue_sspi(sess, ntlm, parms->opaque, attempt, parms, errmsg); + } + + static int verify_sspi(struct auth_request *req, auth_session *sess, +@@ -674,7 +689,7 @@ + return NE_OK; + } + +- return continue_sspi(sess, ntlm, ptr); ++ return continue_sspi(sess, ntlm, ptr, 0, NULL, NULL); + } + + #endif +--- src/ne_auth.h 2009-09-01 22:13:12.000000000 +0200 ++++ src/ne_auth.h 2011-02-03 10:26:20.000000000 +0100 +@@ -47,8 +47,8 @@ + * Hint: if you just wish to attempt authentication just once (even if + * the user gets the username/password wrong), have the callback + * function use 'attempt' value as the function return value. */ +-typedef int (*ne_auth_creds)(void *userdata, const char *realm, int attempt, +- char *username, char *password); ++typedef int (*ne_auth_creds)(void *userdata, const char * auth_protocol, ++ const char *realm, int attempt, char *username, char *password); + + /* Set callbacks to provide credentials for server and proxy + * authentication, using the default set of authentication protocols. +--- src/ne_locks.c 2007-02-05 11:09:27.000000000 +0100 ++++ src/ne_locks.c 2011-02-03 10:26:21.000000000 +0100 +@@ -579,6 +579,23 @@ + const char *token = ne_get_response_header(ctx->req, "Lock-Token"); + /* at the root element; retrieve the Lock-Token header, + * and bail if it wasn't given. */ ++#ifdef IIS_LOCK_BUG_WORKAROUND ++ /* MS IIS violates RFC 2518/4918. It does not send a Lock-Token response ++ header upon successful creation of a new lock. As a workaround, we ++ will try to pick the lock token from the response body (although ++ this is not 100% safe in case of multiple activelocks). */ ++ if (token == NULL) ++ NE_DEBUG(NE_DBG_LOCKS, ++ "Ignoring missing LOCK response Lock-Token header\n"); ++ ++ if (token != NULL) { ++ if (token[0] == '<') token++; ++ ctx->token = ne_strdup(token); ++ ne_shave(ctx->token, ">"); ++ NE_DEBUG(NE_DBG_LOCKS, "lk_startelm: Finding token %s\n", ++ ctx->token); ++ } ++#else + if (token == NULL) { + ne_xml_set_error(ctx->parser, + _("LOCK response missing Lock-Token header")); +@@ -590,12 +607,28 @@ + ne_shave(ctx->token, ">"); + NE_DEBUG(NE_DBG_LOCKS, "lk_startelm: Finding token %s\n", + ctx->token); ++#endif + } + + /* TODO: only accept 'prop' as root for LOCK response */ + if (!can_accept(parent, id)) + return NE_XML_DECLINE; + ++#ifdef IIS_LOCK_BUG_WORKAROUND ++ if (id == ELM_activelock && ctx->found) { ++ /* Found another activelock... */ ++ const char *token = ne_get_response_header(ctx->req, "Lock-Token"); ++ if (token == NULL) { ++ /* Response contains more than one activelock and no Lock-Token ++ * response header. We are doomed. No safe workaround for IIS ++ * lock bug possible. */ ++ ne_xml_set_error(ctx->parser, ++ _("LOCK response missing Lock-Token header and more than one activelock")); ++ return NE_XML_ABORT; ++ } ++ } ++#endif ++ + if (id == ELM_activelock && !ctx->found) { + /* a new activelock */ + ne_lock_free(&ctx->active); +@@ -621,7 +654,12 @@ + return -1; + + if (state == ELM_activelock) { ++#ifdef IIS_LOCK_BUG_WORKAROUND ++ if (ctx->active.token) { ++ ctx->token = ne_strdup(ctx->active.token); ++#else + if (ctx->active.token && strcmp(ctx->active.token, ctx->token) == 0) { ++#endif + ctx->found = 1; + } + } +--- src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200 ++++ src/ne_sspi.c 2011-02-03 10:26:21.000000000 +0100 +@@ -206,6 +206,45 @@ + } + + /* ++ * Simplification wrapper arround AcquireCredentialsHandle as most of ++ * the parameters do not change. ++ */ ++static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password) ++{ ++ SECURITY_STATUS status; ++ TimeStamp timestamp; ++ ++ const char *domain = ""; ++ ++ int rc, rcISC; ++ SecPkgInfo *secPackInfo; ++ SEC_WINNT_AUTH_IDENTITY *nameAndPwd = NULL; ++ int bytesReceived = 0, bytesSent = 0; ++ ++ nameAndPwd = (SEC_WINNT_AUTH_IDENTITY *) malloc( sizeof(SEC_WINNT_AUTH_IDENTITY) ); ++ memset( nameAndPwd, '\0', sizeof (*nameAndPwd) ); ++ nameAndPwd->Domain = (unsigned char *) _strdup( domain? domain: "" ); ++ nameAndPwd->DomainLength = domain? strlen( domain ): 0; ++ nameAndPwd->User = (unsigned char *) _strdup( username? username: "" ); ++ nameAndPwd->UserLength = username? strlen( username ): 0; ++ nameAndPwd->Password = (unsigned char *) _strdup( password? password: "" ); ++ nameAndPwd->PasswordLength = password? strlen( password ): 0; ++ nameAndPwd->Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; ++ ++ status = pSFT->AcquireCredentialsHandle( NULL, package, SECPKG_CRED_OUTBOUND, ++ NULL, nameAndPwd, NULL, NULL, credentials, ×tamp ); ++ ++ if (status != SEC_E_OK) { ++ NE_DEBUG(NE_DBG_HTTPAUTH, ++ "sspi: AcquireCredentialsHandle [fail] [%x].\n", status); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++ ++/* + * Wrapper arround initializeSecurityContext. Supplies several + * default parameters as well as logging in case of errors. + */ +@@ -483,7 +522,7 @@ + * Processes received authentication tokens as well as supplies the + * response token. + */ +-int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken) ++int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken, const char* username, const char* password) + { + SecBufferDesc outBufferDesc; + SecBuffer outBuffer; +@@ -561,13 +600,22 @@ + /* Reset any existing context since we are starting over */ + resetContext(sspiContext); + +- if (acquireCredentialsHandle +- (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) { +- freeBuffer(&outBufferDesc); +- NE_DEBUG(NE_DBG_HTTPAUTH, +- "sspi: acquireCredentialsHandle failed.\n"); +- return -1; +- } ++ if (strlen(username) != 0) { ++ if (acquireCredentialsHandleForUsername ++ (&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) { ++ freeBuffer(&outBufferDesc); ++ NE_DEBUG(NE_DBG_HTTPAUTH, "sspi: acquireCredentialsHandleForUsername failed.\n"); ++ return -1; ++ } ++ } else { ++ if (acquireCredentialsHandle ++ (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) { ++ freeBuffer(&outBufferDesc); ++ NE_DEBUG(NE_DBG_HTTPAUTH, "sspi: acquireCredentialsHandle failed.\n"); ++ return -1; ++ } ++ } ++ + + securityStatus = + initializeSecurityContext(&sspiContext->credentials, NULL, +--- src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100 ++++ src/ne_sspi.h 2011-02-03 10:26:21.000000000 +0100 +@@ -41,7 +41,7 @@ + int ne_sspi_clear_context(void *context); + + int ne_sspi_authenticate(void *context, const char *base64Token, +- char **responseToken); ++ char **responseToken, const char* username, const char* password); + + #endif /* HAVE_SSPI */ + +--- src/ne_openssl.c ++++ src/ne_openssl.c +@@ -43,6 +43,13 @@ + #endif + #endif + ++#ifdef _WIN32 ++#define X509_NAME WIN32_X509_NAME ++#include <windows.h> ++#include <wincrypt.h> ++#undef X509_NAME ++#endif ++ + #include "ne_ssl.h" + #include "ne_string.h" + #include "ne_session.h" +@@ -798,6 +805,31 @@ + X509_STORE_load_locations(store, NE_SSL_CA_BUNDLE, NULL); + #else + X509_STORE_set_default_paths(store); ++#ifdef _WIN32 ++ { ++ HCERTSTORE hStore; ++ PCCERT_CONTEXT pContext = NULL; ++ X509 *x509; ++ ++ hStore = CertOpenSystemStore(0, "ROOT"); ++ if (hStore) ++ { ++ while (pContext = CertEnumCertificatesInStore(hStore, pContext)) ++ { ++ x509 = d2i_X509(NULL, &pContext->pbCertEncoded, pContext->cbCertEncoded); ++ if (x509) ++ { ++ X509_STORE_add_cert(store, x509); ++ X509_free(x509); ++ } ++ } ++ } ++ ++ CertFreeCertificateContext(pContext); ++ CertCloseStore(hStore, 0); ++ } ++#endif ++ + #endif + } + diff --git a/external/neon/neon_fix_lock_timeout_windows.patch b/external/neon/neon_fix_lock_timeout_windows.patch new file mode 100644 index 000000000..72abde762 --- /dev/null +++ b/external/neon/neon_fix_lock_timeout_windows.patch @@ -0,0 +1,37 @@ +--- src.origin/ne_locks.c 2007-02-05 11:09:27.000000000 +0100 ++++ src/ne_locks.c 2015-11-11 16:12:11.236849082 +0100 +@@ -33,6 +33,10 @@ + #include <limits.h> + #endif + ++#ifdef HAVE_ERRNO_H ++#include <errno.h> ++#endif ++ + #include <ctype.h> /* for isdigit() */ + + #include "ne_alloc.h" +@@ -428,9 +432,21 @@ + if (ne_strcasecmp(timeout, "infinite") == 0) { + return NE_TIMEOUT_INFINITE; + } else if (strncasecmp(timeout, "Second-", 7) == 0) { +- long to = strtol(timeout+7, NULL, 10); +- if (to == LONG_MIN || to == LONG_MAX) ++ // according RFC 4918 the value used for lock timeout is unsigned 32 bit ++ // see: <http://tools.ietf.org/html/rfc4918#section-10.7> ++ // adapt it to the 'long' used internally by neon instead ++ errno = 0; ++ unsigned long to1 = strtoul(timeout+7, NULL, 10); ++ if (to1 == ULONG_MAX && errno == ERANGE) + return NE_TIMEOUT_INVALID; ++ NE_DEBUG(NE_DBG_LOCKS, "Parsed lock timeout: %lu\n", to1); ++ long to; ++ // LONG_MAX means around 68 years, ++ // more than enough for practical use ++ if (to1 > LONG_MAX) ++ return LONG_MAX; ++ else ++ to = (long)to1; + return to; + } else { + return NE_TIMEOUT_INVALID; diff --git a/external/neon/neon_fix_lock_token_on_if.patch b/external/neon/neon_fix_lock_token_on_if.patch new file mode 100644 index 000000000..bbe605f40 --- /dev/null +++ b/external/neon/neon_fix_lock_token_on_if.patch @@ -0,0 +1,12 @@ +diff -aru src.origin/ne_locks.c src/ne_locks.c +--- src.origin/ne_locks.c 2007-02-05 11:09:27.000000000 +0100 ++++ src/ne_locks.c 2015-07-29 10:33:55.724753920 +0200 +@@ -137,7 +137,7 @@ + ne_buffer_czappend(req, "If:"); + for (item = lrc->submit; item != NULL; item = item->next) { + char *uri = ne_uri_unparse(&item->lock->uri); +- ne_buffer_concat(req, " <", uri, "> (<", ++ ne_buffer_concat(req, " (<", + item->lock->token, ">)", NULL); + ne_free(uri); + } diff --git a/external/neon/neon_fix_no_OPENSSL_Applink.patch b/external/neon/neon_fix_no_OPENSSL_Applink.patch new file mode 100644 index 000000000..40291ff41 --- /dev/null +++ b/external/neon/neon_fix_no_OPENSSL_Applink.patch @@ -0,0 +1,11 @@ +--- src/ne_openssl.c ++++ src/ne_openssl.c +@@ -440,7 +440,7 @@ + #ifdef NE_DEBUGGING + if (ne_debug_mask & NE_DBG_SSL) { + fprintf(ne_debug_stream, "Cert #%d:\n", n); +- X509_print_fp(ne_debug_stream, cert->subject); ++ // X509_print_fp(ne_debug_stream, cert->subject); + } + #endif + if (top == NULL) { diff --git a/external/neon/neon_fix_sspi_session_timeout.patch b/external/neon/neon_fix_sspi_session_timeout.patch new file mode 100644 index 000000000..5003fda35 --- /dev/null +++ b/external/neon/neon_fix_sspi_session_timeout.patch @@ -0,0 +1,22 @@ +--- src/ne_auth.c~ 2019-12-05 15:38:50.246997951 +0100 ++++ src/ne_auth.c 2019-12-20 06:54:31.555836285 +0100 +@@ -300,8 +300,6 @@ + sess->sspi_token = NULL; + ne_sspi_destroy_context(sess->sspi_context); + sess->sspi_context = NULL; +- if (sess->sspi_host) ne_free(sess->sspi_host); +- sess->sspi_host = NULL; + #endif + #ifdef HAVE_NTLM + if (sess->ntlm_context) { +@@ -1599,6 +1597,10 @@ + } + + clean_session(sess); ++#ifdef HAVE_SSPI ++ if (sess->sspi_host) ne_free(sess->sspi_host); ++ sess->sspi_host = NULL; ++#endif + ne_free(sess); + } + diff --git a/external/neon/neon_ne_set_request_flag.patch b/external/neon/neon_ne_set_request_flag.patch new file mode 100644 index 000000000..5189406a4 --- /dev/null +++ b/external/neon/neon_ne_set_request_flag.patch @@ -0,0 +1,11 @@ +--- src/ne_request.c 2010-09-28 13:57:26.000000000 +0200 ++++ src/ne_request.c 2011-05-18 12:39:05.134445529 +0200 +@@ -585,7 +585,7 @@ + + void ne_set_request_flag(ne_request *req, ne_request_flag flag, int value) + { +- if (flag < (ne_request_flag)NE_SESSFLAG_LAST) { ++ if (flag < (ne_request_flag)NE_REQFLAG_LAST) { + req->flags[flag] = value; + } + } diff --git a/external/neon/neon_uri_parse_allow_others.patch b/external/neon/neon_uri_parse_allow_others.patch new file mode 100644 index 000000000..7c3540a05 --- /dev/null +++ b/external/neon/neon_uri_parse_allow_others.patch @@ -0,0 +1,23 @@ +diff -ur src/ne_uri.c +--- src/ne_uri.c 2020-02-07 10:49:58.764417840 +0000 ++++ src/ne_uri.c 2020-02-07 10:51:33.675627141 +0000 +@@ -87,7 +87,9 @@ + /* pchar = unreserved / pct-encoded / sub-delims / ":" / "@" */ + #define URI_PCHAR (URI_UNRESERVED | PC | URI_SUBDELIM | CL | AT) + /* invented: segchar = pchar / "/" */ +-#define URI_SEGCHAR (URI_PCHAR | FS) ++/* allow OT characters to parse SharePoint 2016 href IRIs (breaking the spec ++ * of href XML Element: "MUST contain a URI or a relative reference." */ ++#define URI_SEGCHAR (URI_PCHAR | FS | OT) + /* query = *( pchar / "/" / "?" ) */ + #define URI_QUERY (URI_PCHAR | FS | QU) + /* fragment == query */ +@@ -237,7 +238,7 @@ + + p = s; + +- while (uri_lookup(*p) & URI_SEGCHAR) ++ while (uri_lookup(*p) & URI_SEGCHAR && *p != '\0') + p++; + + /* => p = [ "?" query ] [ "#" fragment ] */ diff --git a/external/neon/neon_with_gnutls.patch b/external/neon/neon_with_gnutls.patch new file mode 100644 index 000000000..ed8b7faad --- /dev/null +++ b/external/neon/neon_with_gnutls.patch @@ -0,0 +1,29 @@ +--- src/ne_gnutls.c 2009-12-02 23:40:41.000000000 +0200 ++++ src/ne_gnutls.c 2013-03-29 13:41:00.429857276 +0200 +@@ -48,6 +48,26 @@ + #include <iconv.h> + #endif + ++ ++/* GnuTLS removed these symbols from 2.99.0. ++ * ++ * This is a dodgy solution to avoid further patching of neon ++ * sources */ ++#if LIBGNUTLS_VERSION_NUMBER >= 0x026300 ++# define gnutls_pkcs12 gnutls_pkcs12_t ++# define gnutls_pkcs12_bag gnutls_pkcs12_bag_t ++# define gnutls_pkcs12_bag_type gnutls_pkcs12_bag_type_t ++# define gnutls_certificate_verify_peers(_ssl) ({ \ ++ int __status_ ## __LINE__ = 0; \ ++ gnutls_certificate_verify_peers2((_ssl), &__status_ ## __LINE__) == 0 \ ++ ? __status_ ## __LINE__ : -1; \ ++ }) ++#elif LIBGNUTLS_VERSION_NUMBER >= 0x020303 ++/* GnuTLS had these symbols since 2.3.3. */ ++# define HAVE_GNUTLS_CERTIFICATE_GET_X509_CAS ++#endif /* LIBGNUTLS_VERSION_NUMBER */ ++ ++ + #include "ne_ssl.h" + #include "ne_string.h" + #include "ne_session.h" diff --git a/external/neon/ubsan.patch b/external/neon/ubsan.patch new file mode 100644 index 000000000..56445fcb7 --- /dev/null +++ b/external/neon/ubsan.patch @@ -0,0 +1,11 @@ +--- src/ne_compress.c ++++ src/ne_compress.c +@@ -81,7 +81,7 @@ + }; + + /* Convert 'buf' to unsigned int; 'buf' must be 'unsigned char *' */ +-#define BUF2UINT(buf) (((buf)[3]<<24) + ((buf)[2]<<16) + ((buf)[1]<<8) + (buf)[0]) ++#define BUF2UINT(buf) (((unsigned)((buf)[3])<<24) + ((buf)[2]<<16) + ((buf)[1]<<8) + (buf)[0]) + + #define ID1 0x1f + #define ID2 0x8b diff --git a/external/nss/ExternalPackage_nss.mk b/external/nss/ExternalPackage_nss.mk new file mode 100644 index 000000000..2b15fc3eb --- /dev/null +++ b/external/nss/ExternalPackage_nss.mk @@ -0,0 +1,67 @@ +# -*- 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_ExternalPackage_ExternalPackage,nss,nss)) + +$(eval $(call gb_ExternalPackage_use_external_project,nss,nss)) + +ifeq ($(OS),iOS) +# nothing... +else ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ + dist/out/lib/libfreebl3.dylib \ + dist/out/lib/libnspr4.dylib \ + dist/out/lib/libnss3.dylib \ + dist/out/lib/libnssckbi.dylib \ + dist/out/lib/libnssdbm3.dylib \ + dist/out/lib/libnssutil3.dylib \ + dist/out/lib/libplc4.dylib \ + dist/out/lib/libplds4.dylib \ + dist/out/lib/libsmime3.dylib \ + dist/out/lib/libsoftokn3.dylib \ + dist/out/lib/libssl3.dylib \ +)) +else ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ + dist/out/lib/freebl3.dll \ + dist/out/lib/nspr4.dll \ + dist/out/lib/nss3.dll \ + dist/out/lib/nssckbi.dll \ + dist/out/lib/nssdbm3.dll \ + dist/out/lib/nssutil3.dll \ + dist/out/lib/plc4.dll \ + dist/out/lib/plds4.dll \ + dist/out/lib/smime3.dll \ + dist/out/lib/softokn3.dll \ + dist/out/lib/sqlite3.dll \ + dist/out/lib/ssl3.dll \ +)) +else # OS!=WNT/MACOSX +$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ + dist/out/lib/libfreebl3.so \ + dist/out/lib/libnspr4.so \ + dist/out/lib/libnss3.so \ + dist/out/lib/libnssckbi.so \ + dist/out/lib/libnssdbm3.so \ + dist/out/lib/libnssutil3.so \ + dist/out/lib/libplc4.so \ + dist/out/lib/libplds4.so \ + dist/out/lib/libsmime3.so \ + dist/out/lib/libsoftokn3.so \ + dist/out/lib/libssl3.so \ + dist/out/lib/libsqlite3.so \ +)) +endif +ifeq ($(OS),LINUX) +$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ + dist/out/lib/libfreeblpriv3.so \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk new file mode 100644 index 000000000..5de54f467 --- /dev/null +++ b/external/nss/ExternalProject_nss.mk @@ -0,0 +1,90 @@ +# -*- 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,nss)) + +# nss build calls configure for nspr itself - if for some reason the configure step should be split out, +# make sure to create config.status (aka run configure) in dir specified with OBJDIR_NAME (nspr/out) +$(eval $(call gb_ExternalProject_register_targets,nss,\ + build \ +)) + +ifeq ($(OS),WNT) +$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_Trace_StartRange,nss,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \ + $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \ + MOZ_DEBUG_SYMBOLS=1 \ + MOZ_DEBUG_FLAGS=" " \ + OPT_CODE_SIZE=0) \ + OS_TARGET=WIN95 \ + $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \ + LIB="$(ILIB)" \ + XCFLAGS="$(SOLARINC)" \ + $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \ + NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ + NSS_DISABLE_GTESTS=1 \ + ,nss) + $(call gb_Trace_EndRange,nss,EXTERNAL) + +else # OS!=WNT +# make sure to specify NSPR_CONFIGURE_OPTS as env (before make command), so nss can append it's own defaults +# OTOH specify e.g. CC and NSINSTALL as arguments (after make command), so they will overrule nss makefile values +$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_Trace_StartRange,nss,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ + $(if $(filter ANDROID,$(OS)),$(if $(filter AARCH64,$(CPUNAME)),USE_64=1)) \ + $(if $(filter AARCH64 ARM64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \ + $(if $(filter MACOSX,$(OS)),\ + $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ + NSS_USE_SYSTEM_SQLITE=1) \ + $(if $(filter LINUX,$(OS)),$(if $(ENABLE_DBGUTIL),,BUILD_OPT=1)) \ + $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ + $(if $(CROSS_COMPILING),\ + CROSS_COMPILE=1 \ + $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \ + $(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ + NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ + $(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell uname -m)), \ + CPU_ARCH=x86_64 \ + NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ + NSDISTMODE=copy \ + $(MAKE) AR="$(AR)" \ + RANLIB="$(RANLIB)" \ + NMEDIT="$(NM)edit" \ + COMMA=$(COMMA) \ + CC="$(CC)$(if $(filter ANDROID,$(OS)), -D_PR_NO_LARGE_FILES=1 -DSQLITE_DISABLE_LFS=1)" CCC="$(CXX)" \ + $(if $(CROSS_COMPILING),NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \ + $(if $(filter ANDROID,$(OS)),OS_TARGET=Android OS_TARGET_RELEASE=16 ARCHFLAG="" DEFAULT_COMPILER=clang ANDROID_NDK=$(ANDROID_NDK_HOME) ANDROID_TOOLCHAIN_VERSION=$(ANDROID_GCC_TOOLCHAIN_VERSION) ANDROID_PREFIX=$(HOST_PLATFORM) ANDROID_SYSROOT=$(ANDROID_NDK_HOME)/sysroot ANDROID_TOOLCHAIN=$(ANDROID_BINUTILS_PREBUILT_ROOT)) \ + NSS_DISABLE_GTESTS=1 \ + nss_build_all \ + && rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \ + $(if $(filter MACOSX,$(OS)),\ + && chmod u+w $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \ + && $(PERL) \ + $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libfreebl3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libnspr4.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libnss3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libnssckbi.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libnssdbm3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libnssutil3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libplc4.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libplds4.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libsmime3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libsoftokn3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libssl3.dylib) \ + ,nss) + $(call gb_Trace_EndRange,nss,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/nss/Makefile b/external/nss/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/nss/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/nss/Module_nss.mk b/external/nss/Module_nss.mk new file mode 100644 index 000000000..eae9e9524 --- /dev/null +++ b/external/nss/Module_nss.mk @@ -0,0 +1,18 @@ +# -*- 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,nss)) + +$(eval $(call gb_Module_add_targets,nss,\ + UnpackedTarball_nss \ + ExternalPackage_nss \ + ExternalProject_nss \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/nss/README b/external/nss/README new file mode 100644 index 000000000..6997cea6c --- /dev/null +++ b/external/nss/README @@ -0,0 +1,37 @@ +Contains the Network Security Services (NSS) libraries from Mozilla + +== Fips 140 and signed libraries == + +Fips 140 mode is not supported. That is, the *.chk files containing the +checksums for the cryptographic module are not delivered into instdir and will +not be part of the OOo installation sets. + +Signing has been turned off because +- we change the rpath (install names) after signing which breaks the signatures +(Mac) +- sqlite conflicts with the system sqlite when signing which breaks the build + +See also +[https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6] + +== libsqlite3 == + +With all supported macOS SDK we use +NSS_USE_SYSTEM_SQLITE=1 +to build using the system sqlite. + +== system NSS on Linux == + +Note that different Linux distributions use different SONAMEs for the +NSS libraries, so it is not possible to use --with-system-nss and build +a portable generic LO installation set, despite NSS upstream apparently +maintaining ABI compatibility. + +Debian Squeeze: +0x000000000000000e (SONAME) Library soname: [libnss3.so.1d] +Fedora 20: +0x000000000000000e (SONAME) Library soname: [libnss3.so] + +For the record, the LSB specified SONAME is libnss3.so +http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/libnss3.html + diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk new file mode 100644 index 000000000..dab244c86 --- /dev/null +++ b/external/nss/UnpackedTarball_nss.mk @@ -0,0 +1,51 @@ +# -*- 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,nss)) + +$(eval $(call gb_UnpackedTarball_set_tarball,nss,$(NSS_TARBALL))) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,nss,nspr/build/autoconf)) + +$(eval $(call gb_UnpackedTarball_add_patches,nss,\ + external/nss/nss.patch \ + external/nss/nss.aix.patch \ + external/nss/nss-3.13.5-zlib-werror.patch \ + external/nss/nss_macosx.patch \ + external/nss/nss-win32-make.patch.1 \ + external/nss/ubsan.patch.0 \ + external/nss/clang-cl.patch.0 \ + external/nss/nss.vs2015.patch \ + external/nss/nss.vs2015.pdb.patch \ + external/nss/nss.bzmozilla1238154.patch \ + external/nss/nss-bz1646594.patch.1 \ + external/nss/macos-dlopen.patch.0 \ + external/nss/nss-restore-manual-pre-dependencies.patch.1 \ + external/nss/nss.getopt.patch.0 \ + $(if $(filter iOS,$(OS)), \ + external/nss/nss-ios.patch) \ + $(if $(filter ANDROID,$(OS)), \ + external/nss/nss-android.patch.1) \ + $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \ + external/nss/nss.cygwin64.in32bit.patch) \ + $(if $(filter WNT,$(OS)), \ + external/nss/nss.windows.patch \ + external/nss/nss.nowerror.patch \ + external/nss/nss.utf8bom.patch.1) \ +)) + +ifeq ($(COM_IS_CLANG),TRUE) +ifneq ($(filter -fsanitize=%,$(CC)),) +$(eval $(call gb_UnpackedTarball_add_patches,nss,\ + external/nss/asan.patch.1 \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1 new file mode 100644 index 000000000..7dfd6ed4e --- /dev/null +++ b/external/nss/asan.patch.1 @@ -0,0 +1,12 @@ +diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk +--- nss.org/nss/coreconf/Linux.mk 2014-05-06 04:36:01.817838877 +0200 ++++ nss/nss/coreconf/Linux.mk 2014-05-06 04:37:25.387835456 +0200 +@@ -146,7 +146,7 @@ + # we don't use -z defs there. + # Also, -z defs conflicts with Address Sanitizer, which emits relocations + # against the libsanitizer runtime built into the main executable. +-ZDEFS_FLAG = -Wl,-z,defs ++ZDEFS_FLAG = + DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) $(if $(filter-out $(OS),ANDROID),-Wl$(COMMA)-z$(COMMA)origin '-Wl$(COMMA)-rpath$(COMMA)$$ORIGIN') + LDFLAGS += $(ARCHFLAG) -z noexecstack + diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0 new file mode 100644 index 000000000..1d615c239 --- /dev/null +++ b/external/nss/clang-cl.patch.0 @@ -0,0 +1,111 @@ +# "#pragma deprecated" and "#pragma intrinsic" not (yet?) handled in the "if +# (LangOpts.MicrosoftExt)" block in Preprocessor::RegisterBuiltinPragmas in +# Clang's lib/Lex/Pragma.cpp: +--- nspr/pr/include/pratom.h ++++ nspr/pr/include/pratom.h +@@ -83,7 +83,7 @@ + + #include <intrin.h> + +-#ifdef _MSC_VER ++#if defined _WIN32 && !defined __clang__ + #pragma intrinsic(_InterlockedIncrement) + #pragma intrinsic(_InterlockedDecrement) + #pragma intrinsic(_InterlockedExchange) +--- nspr/pr/include/prbit.h ++++ nspr/pr/include/prbit.h +@@ -14,7 +14,7 @@ + */ + #if defined(_WIN32) && (_MSC_VER >= 1300) && \ + (defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM) || \ +- defined(_M_ARM64)) ++ defined(_M_ARM64)) && !defined __clang__ + # include <intrin.h> + # pragma intrinsic(_BitScanForward,_BitScanReverse) + __forceinline static int __prBitScanForward32(unsigned int val) +@@ -32,7 +32,7 @@ + # define pr_bitscan_ctz32(val) __prBitScanForward32(val) + # define pr_bitscan_clz32(val) __prBitScanReverse32(val) + # define PR_HAVE_BUILTIN_BITSCAN32 +-#elif ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) && \ ++#elif defined __GNUC__ && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) && \ + (defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \ + defined(__aarch64__)) + # define pr_bitscan_ctz32(val) __builtin_ctz(val) +@@ -136,7 +136,7 @@ + */ + + #if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || \ +- defined(_M_X64) || defined(_M_ARM) || defined(_M_ARM64)) ++ defined(_M_X64) || defined(_M_ARM) || defined(_M_ARM64)) && !defined __clang__ + #include <stdlib.h> + #pragma intrinsic(_rotl, _rotr) + #define PR_ROTATE_LEFT32(a, bits) _rotl(a, bits) +--- nss/lib/certdb/certdb.h ++++ nss/lib/certdb/certdb.h +@@ -21,7 +21,7 @@ + /* On Windows, Mac, and Linux (and other gcc platforms), we can give compile + * time deprecation warnings when applications use the old CERTDB_VALID_PEER + * define */ +-#if __GNUC__ > 3 ++#if defined __GNUC__ && __GNUC__ > 3 + #if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5) + typedef unsigned int __CERTDB_VALID_PEER __attribute__((deprecated)); + #else +@@ -30,7 +30,7 @@ + #endif + #define CERTDB_VALID_PEER ((__CERTDB_VALID_PEER)CERTDB_TERMINAL_RECORD) + #else +-#ifdef _WIN32 ++#if defined _WIN32 && !defined __clang__ + #pragma deprecated(CERTDB_VALID_PEER) + #endif + #define CERTDB_VALID_PEER CERTDB_TERMINAL_RECORD +--- nss/lib/util/pkcs11n.h ++++ nss/lib/util/pkcs11n.h +@@ -426,7 +426,7 @@ + /* keep the old value for compatibility reasons*/ + #define CKT_NSS_MUST_VERIFY ((__CKT_NSS_MUST_VERIFY)(CKT_NSS + 4)) + #else +-#ifdef _WIN32 ++#if defined _WIN32 && !defined __clang__ + /* This magic gets the windows compiler to give us a deprecation + * warning */ + #pragma deprecated(CKT_NSS_UNTRUSTED, CKT_NSS_MUST_VERIFY, CKT_NSS_VALID) + +# While MSVC uses +# #pragma warning(disable : 4103) +# in the inner pkcs11p.h, clang-cl wants +# #pragma clang diagnostic ignored "-Wpragma-pack" +# in the outer pkcs11t.h: +--- nss/lib/util/pkcs11t.h ++++ nss/lib/util/pkcs11t.h +@@ -72,7 +72,14 @@ + #define CK_INVALID_HANDLE 0 + + /* pack */ ++#if defined __clang__ && defined _MSC_VER ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wpragma-pack" ++#endif + #include "pkcs11p.h" ++#if defined __clang__ && defined _MSC_VER ++#pragma clang diagnostic pop ++#endif + + typedef struct CK_VERSION { + CK_BYTE major; /* integer portion of version number */ +@@ -1795,6 +1802,13 @@ + #include "pkcs11n.h" + + /* undo packing */ ++#if defined __clang__ && defined _MSC_VER ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wpragma-pack" ++#endif + #include "pkcs11u.h" ++#if defined __clang__ && defined _MSC_VER ++#pragma clang diagnostic pop ++#endif + + #endif diff --git a/external/nss/macos-dlopen.patch.0 b/external/nss/macos-dlopen.patch.0 new file mode 100644 index 000000000..1889b8df7 --- /dev/null +++ b/external/nss/macos-dlopen.patch.0 @@ -0,0 +1,25 @@ +--- nspr/pr/src/linking/prlink.c ++++ nspr/pr/src/linking/prlink.c +@@ -799,7 +799,7 @@ + * The reason is that DARWIN's dlopen ignores the provided path + * and checks for the plain filename in DYLD_LIBRARY_PATH, + * which could load an unexpected version of a library. */ +- if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL) { ++ if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name, "@loader_path/", 13) == 0) { + /* no slash, allow to load from any location */ + okToLoad = PR_TRUE; + } else { +--- nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c ++++ nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c +@@ -224,7 +224,11 @@ + static PRStatus PR_CALLBACK pkix_getDecodeFunction(void) + { + pkix_decodeFunc.smimeLib = ++#if defined DARWIN ++ PR_LoadLibrary("@loader_path/" SHLIB_PREFIX"smime3."SHLIB_SUFFIX); ++#else + PR_LoadLibrary(SHLIB_PREFIX"smime3."SHLIB_SUFFIX); ++#endif + if (pkix_decodeFunc.smimeLib == NULL) { + return PR_FAILURE; + } diff --git a/external/nss/nsinstall.py b/external/nss/nsinstall.py new file mode 100644 index 000000000..80e9c1679 --- /dev/null +++ b/external/nss/nsinstall.py @@ -0,0 +1,169 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is Mozilla. +# +# The Initial Developer of the Original Code is +# the Mozilla Foundation. +# Portions created by the Initial Developer are Copyright (C) 2007 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Axel Hecht <axel@pike.org> +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +# This is a partial python port of nsinstall. +# It's intended to be used when there's no natively compile nsinstall +# available, and doesn't intend to be fully equivalent. +# Its major use is for l10n repackaging on systems that don't have +# a full build environment set up. +# The basic limitation is, it doesn't even try to link and ignores +# all related options. + +from optparse import OptionParser +import os +import os.path +import sys +import shutil + +def nsinstall(argv): + usage = "usage: %prog [options] arg1 [arg2 ...] target-directory" + p = OptionParser(usage=usage) + + p.add_option('-D', action="store_true", + help="Create a single directory only") + p.add_option('-t', action="store_true", + help="Preserve time stamp") + p.add_option('-m', action="store", + help="Set mode", metavar="mode") + p.add_option('-d', action="store_true", + help="Create directories in target") + p.add_option('-R', action="store_true", + help="Use relative symbolic links (ignored)") + p.add_option('-l', action="store_true", + help="Create link (ignored)") + p.add_option('-L', action="store", metavar="linkprefix", + help="Link prefix (ignored)") + + # The remaining arguments are not used in our tree, thus they're not + # implented. + def BadArg(option, opt, value, parser): + parser.error('option not supported: %s' % opt) + + p.add_option('-C', action="callback", metavar="CWD", + callback=BadArg, + help="NOT SUPPORTED") + p.add_option('-o', action="callback", callback=BadArg, + help="Set owner (NOT SUPPORTED)", metavar="owner") + p.add_option('-g', action="callback", callback=BadArg, + help="Set group (NOT SUPPORTED)", metavar="group") + + (options, args) = p.parse_args(argv) + + if options.m: + # mode is specified + try: + options.m = int(options.m, 8) + # I have no idea why nss insists on using this mode for installed headers. + # It causes problems with updating the files during a rebuild. + if options.m == 0o444: + options.m = 0o644 + except: + sys.stderr.write('nsinstall: ' + options.m + ' is not a valid mode\n') + return 1 + + # just create one directory? + if options.D: + if len(args) != 1: + return 1 + if os.path.exists(args[0]): + if not os.path.isdir(args[0]): + sys.stderr.write('nsinstall: ' + args[0] + ' is not a directory\n') + sys.exit(1) + if options.m: + os.chmod(args[0], options.m) + sys.exit() + if options.m: + os.makedirs(args[0], options.m) + else: + os.makedirs(args[0]) + return 0 + + # nsinstall arg1 [...] directory + if len(args) < 2: + p.error('not enough arguments') + + def copy_all_entries(entries, target): + for e in entries: + dest = os.path.join(target, + os.path.basename(os.path.normpath(e))) + handleTarget(e, dest) + if options.m: + os.chmod(dest, options.m) + + # set up handler + if options.d: + # we're supposed to create directories + def handleTarget(srcpath, targetpath): + # target directory was already created, just use mkdir + os.mkdir(targetpath) + else: + # we're supposed to copy files + def handleTarget(srcpath, targetpath): + if os.path.isdir(srcpath): + if not os.path.exists(targetpath): + os.mkdir(targetpath) + entries = [os.path.join(srcpath, e) for e in os.listdir(srcpath)] + copy_all_entries(entries, targetpath) + # options.t is not relevant for directories + if options.m: + os.chmod(targetpath, options.m) + elif options.t: + if os.path.exists(targetpath): + os.remove(targetpath) + shutil.copy2(srcpath, targetpath) + else: + if os.path.exists(targetpath): + os.chmod(targetpath, 0o755) + os.remove(targetpath) + shutil.copy(srcpath, targetpath) + + # the last argument is the target directory + target = args.pop() + # ensure target directory + if not os.path.isdir(target): + try: + os.makedirs(target) + except FileExistsError: + if not os.path.isdir(target): + sys.stderr.write('nsinstall: ' + target + ' is not a directoy!\n') + return 1 + + copy_all_entries(args, target) + return 0 + +if __name__ == '__main__': + sys.exit(nsinstall(sys.argv[1:])) diff --git a/external/nss/nss-3.13.5-zlib-werror.patch b/external/nss/nss-3.13.5-zlib-werror.patch new file mode 100644 index 000000000..0cdbf7808 --- /dev/null +++ b/external/nss/nss-3.13.5-zlib-werror.patch @@ -0,0 +1,13 @@ +--- a/a/nss/lib/zlib/gzguts.h 2010-08-22 03:07:03.000000000 +0200 ++++ b/b/nss/lib/zlib/gzguts.h 2012-07-17 08:52:14.821552788 +0200 +@@ -26,6 +26,10 @@ + # define write _write + # define close _close + #endif ++ ++#ifndef _WIN32 ++#include <unistd.h> ++#endif + + #ifdef NO_DEFLATE /* for compatibility with old definition */ + # define NO_GZCOMPRESS diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1 new file mode 100644 index 000000000..b77663c59 --- /dev/null +++ b/external/nss/nss-android.patch.1 @@ -0,0 +1,93 @@ +diff -ur nss.org/nspr/build/autoconf/config.sub nss/nspr/build/autoconf/config.sub +--- nss.org/nspr/build/autoconf/config.sub 2017-09-07 15:29:45.031246453 +0200 ++++ nss/nspr/build/autoconf/config.sub 2017-09-07 15:32:13.087235423 +0200 +@@ -111,6 +111,11 @@ + exit 1;; + esac + ++if test $1 = "arm-unknown-linux-androideabi"; then echo $1; exit; fi ++if test $1 = "aarch64-unknown-linux-android"; then echo $1; exit; fi ++if test $1 = "i686-pc-linux-android"; then echo $1; exit; fi ++if test $1 = "x86_64-pc-linux-android"; then echo $1; exit; fi ++ + # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +diff -ur nss.org/nspr/configure nss/nspr/configure +--- nss.org/nspr/configure 2017-09-07 15:29:45.018246359 +0200 ++++ nss/nspr/configure 2017-09-07 15:31:47.604075663 +0200 +@@ -2737,18 +2739,15 @@ + esac + + AS="$android_toolchain"/bin/"$android_tool_prefix"-as +- CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc +- CXX="$android_toolchain"/bin/"$android_tool_prefix"-g++ +- CPP="$android_toolchain"/bin/"$android_tool_prefix"-cpp ++ CC="$CC" ++ CXX="$CXX" ++ CPP="$CC" -E + LD="$android_toolchain"/bin/"$android_tool_prefix"-ld + AR="$android_toolchain"/bin/"$android_tool_prefix"-ar + RANLIB="$android_toolchain"/bin/"$android_tool_prefix"-ranlib + STRIP="$android_toolchain"/bin/"$android_tool_prefix"-strip + + CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS" +- CFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CFLAGS" +- CXXFLAGS="-mandroid -I$android_platform/usr/include -fpic -fno-short-enums -fno-exceptions $CXXFLAGS" +- LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS" + + $as_echo "#define ANDROID 1" >>confdefs.h + +diff -ur nss.org/nss/Makefile nss/nss/Makefile +--- nss.org/nss/Makefile 2017-09-07 15:29:44.933245745 +0200 ++++ nss/nss/Makefile 2017-09-07 15:32:04.347181076 +0200 +@@ -62,7 +62,7 @@ + + ifeq ($(OS_TARGET),Android) + NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \ +- --target=$(ANDROID_PREFIX) \ ++ --with-arch=toolchain-default \ + --with-android-version=$(OS_TARGET_RELEASE) \ + --with-android-toolchain=$(ANDROID_TOOLCHAIN) \ + --with-android-platform=$(ANDROID_SYSROOT) +--- nss/nss/Makefile.orig 2019-11-26 14:52:15.934561202 +0100 ++++ nss/nss/Makefile 2019-11-26 14:52:20.538559612 +0100 +@@ -140,7 +140,6 @@ + + build_nspr: $(NSPR_CONFIG_STATUS) + $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests + + install_nspr: build_nspr + $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install +--- nss/nss/lib/ckfw/builtins/manifest.mn.orig 2019-11-26 15:18:22.185985193 +0100 ++++ nss/nss/lib/ckfw/builtins/manifest.mn 2019-11-26 15:18:29.281982387 +0100 +@@ -5,7 +5,7 @@ + + CORE_DEPTH = ../../.. + +-DIRS = testlib ++DIRS = + + MODULE = nss + MAPFILE = $(OBJDIR)/nssckbi.def +diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk +--- nss/nss/coreconf/arch.mk 2019-11-01 10:29:44.933245745 +0100 ++++ nss/nss/coreconf/arch.mk 2019-11-01 10:32:04.347181076 +0100 +@@ -234,7 +234,15 @@ + # + # this should be configurable from the user + # +- OS_TEST := arm ++ ifneq (,$(filter x86 x86_64,$(ANDROID_APP_ABI))) ++ OS_TEST := $(ANDROID_APP_ABI) ++ else ++ ifeq ($(USE_64),1) ++ OS_TEST := aarch64 ++ else ++ OS_TEST := arm ++ endif ++ endif + OS_ARCH = Android + ifndef OS_TARGET_RELEASE + OS_TARGET_RELEASE := 8 diff --git a/external/nss/nss-bz1646594.patch.1 b/external/nss/nss-bz1646594.patch.1 new file mode 100644 index 000000000..e6c75922a --- /dev/null +++ b/external/nss/nss-bz1646594.patch.1 @@ -0,0 +1,15 @@ +regression from https://bugzilla.mozilla.org/show_bug.cgi?id=1646594 + +--- nss/nss/coreconf/arch.mk.orig2 2020-08-18 14:33:21.295252404 +0200 ++++ nss/nss/coreconf/arch.mk 2020-08-18 14:33:46.360320806 +0200 +@@ -116,8 +116,10 @@ + OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) + endif + KERNEL = Linux ++ifneq ($(OS_TARGET),Android) + include $(CORE_DEPTH)/coreconf/Linux.mk + endif ++endif + + # Since all uses of OS_ARCH that follow affect only userland, we can + # merge other Glibc systems with Linux here. diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch new file mode 100644 index 000000000..9d4af2c72 --- /dev/null +++ b/external/nss/nss-ios.patch @@ -0,0 +1,112 @@ +--- a/a/nspr/config/autoconf.mk.in ++++ a/a/nspr/config/autoconf.mk.in +@@ -67,7 +67,7 @@ + MSC_VER = @MSC_VER@ + AR = @AR@ + AR_FLAGS = @AR_FLAGS@ +-LD = @LD@ ++LD = echo + RANLIB = @RANLIB@ + PERL = @PERL@ + RC = @RC@ +--- a/a/nspr/configure ++++ a/a/nspr/configure +@@ -755,7 +755,7 @@ + OBJDIR='$(OBJDIR_NAME)' + OBJDIR_NAME=. + OBJDIR_SUFFIX=OBJ +-NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall' ++NSINSTALL=${NSINSTALL?'$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'} + NOSUCHFILE=/no-such-file + LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)' + LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)' +@@ -3060,7 +3060,7 @@ + LIB_SUFFIX=a + DLL_SUFFIX=so + ASM_SUFFIX=s +-MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' ++MKSHLIB='touch $@; echo' + PR_MD_ASFILES= + PR_MD_CSRCS= + PR_MD_ARCH_DIR=unix +@@ -3904,7 +3904,7 @@ + DSO_CFLAGS=-fPIC + DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @__________________________________________________OOO/$@ -headerpad_max_install_names' + _OPTIMIZE_FLAGS=-O2 +- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' ++ MKSHLIB=touch $@ + STRIP="$STRIP -x -S" + DLL_SUFFIX=dylib + USE_PTHREADS=1 +--- a/a/nss/coreconf/ruleset.mk ++++ a/a/nss/coreconf/ruleset.mk +@@ -68,7 +68,7 @@ + endif + + ifeq ($(MKPROG),) +- MKPROG = $(CC) ++ MKPROG = touch $@; echo + endif + + # +--- a/a/nss/coreconf/Darwin.mk ++++ a/a/nss/coreconf/Darwin.mk +@@ -124,7 +124,7 @@ + DSO_LDOPTS += --coverage + endif + +-MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) ++MKSHLIB = touch $@; echo + DLL_SUFFIX = dylib + ifdef MAPFILE + MKSHLIB += -exported_symbols_list $(MAPFILE) +--- a/a/nss/coreconf/UNIX.mk ++++ a/a/nss/coreconf/UNIX.mk +@@ -21,10 +21,14 @@ + + ifdef BUILD_TREE + NSINSTALL_DIR = $(BUILD_TREE)/nss ++ifndef NSINSTALL + NSINSTALL = $(BUILD_TREE)/nss/nsinstall ++endif + else + NSINSTALL_DIR = $(CORE_DEPTH)/coreconf/nsinstall ++ifndef NSINSTALL + NSINSTALL = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall ++endif + endif + + MKDEPEND_DIR = $(CORE_DEPTH)/coreconf/mkdepend +--- a/a/nspr/pr/include/md/_darwin.h ++++ a/a/nspr/pr/include/md/_darwin.h +@@ -26,6 +26,8 @@ + #define _PR_SI_ARCHITECTURE "ppc" + #elif defined(__arm__) + #define _PR_SI_ARCHITECTURE "arm" ++#elif defined(__arm64__) ++#define _PR_SI_ARCHITECTURE "arm64" + #elif defined(__aarch64__) + #define _PR_SI_ARCHITECTURE "aarch64" + #else +--- a/a/nspr/pr/src/Makefile.in ++++ a/a/nspr/pr/src/Makefile.in +@@ -180,7 +180,7 @@ + endif + + ifeq ($(OS_TARGET),MacOSX) +-OS_LIBS = -framework CoreServices -framework CoreFoundation ++OS_LIBS = -framework CoreFoundation + endif + + EXTRA_LIBS += $(OS_LIBS) +--- a/a/nss/cmd/shlibsign/sign.sh ++++ a/a/nss/cmd/shlibsign/sign.sh +@@ -2,6 +2,8 @@ + # 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/. ++ ++exit 0 + + # arguments: + # 1: full path to DIST/OBJDIR (parent dir of "lib") diff --git a/external/nss/nss-restore-manual-pre-dependencies.patch.1 b/external/nss/nss-restore-manual-pre-dependencies.patch.1 new file mode 100644 index 000000000..ebcc5b48c --- /dev/null +++ b/external/nss/nss-restore-manual-pre-dependencies.patch.1 @@ -0,0 +1,83 @@ +Revert of upstream: + +changeset: 15608:744881490c78 +user: Jan-Marek Glogowski <glogow@fbihome.de> +date: Wed May 13 19:00:40 2020 +0000 +summary: Bug 1637083 Replace pre-dependency with shell hack r=rrelyea + +--- b/nss/coreconf/rules.mk Wed May 13 19:00:40 2020 +0000 ++++ a/nss/coreconf/rules.mk Tue May 12 21:33:43 2020 +0000 +@@ -31,21 +31,10 @@ + USE_NT_C_SYNTAX=1 + endif + +-# For whatever reason, "." can't be handled using make conditionals. +-# Based on automake's SUBDIRS "." handling. + ifdef DIRS + ifndef IGNORE_DIRS +-ifneq (,$(filter .,$(DIRS))) +-TARGETS = $(NULL) +-ALL_TRASH = $(NULL) +-endif +- + $(DIRS): ++ $(IGNORE_ERROR)@$(MAKE) -C $@ $(MAKECMDGOALS) +- $(IGNORE_ERROR)@if [ "$@" != "." ]; then \ +- $(MAKE) -C $@ $(MAKECMDGOALS) ; \ +- else \ +- IGNORE_DIRS=1 $(MAKE) -C $@ $(MAKECMDGOALS) ; \ +- fi + @$(CLICK_STOPWATCH) + endif + endif +@@ -84,9 +73,7 @@ + check: $(DIRS) + + clean clobber: $(DIRS) +-ifneq (,$(ALL_TRASH)) + rm -rf $(ALL_TRASH) +-endif + + realclean clobber_all: $(DIRS) + rm -rf $(wildcard *.OBJ) dist $(ALL_TRASH) +--- b/nss/lib/ckfw/builtins/manifest.mn Wed May 13 19:00:40 2020 +0000 ++++ a/nss/lib/ckfw/builtins/manifest.mn Tue May 12 21:33:43 2020 +0000 +@@ -5,9 +5,7 @@ + + CORE_DEPTH = ../../.. + ++DIRS = testlib +-DIRS = . testlib +- +-testlib: . + + MODULE = nss + +--- b/nss/lib/ckfw/manifest.mn Wed May 13 19:00:40 2020 +0000 ++++ a/nss/lib/ckfw/manifest.mn Tue May 12 21:33:43 2020 +0000 +@@ -5,9 +5,7 @@ + + CORE_DEPTH = ../.. + ++DIRS = builtins +-DIRS = . builtins +- +-builtins: . + + PRIVATE_EXPORTS = \ + ck.h \ +--- b/nss/manifest.mn Wed May 13 19:00:40 2020 +0000 ++++ a/nss/manifest.mn Tue May 12 21:33:43 2020 +0000 +@@ -23,6 +23,12 @@ + # no real way to encode these in any sensible way + $(MAKE) -C coreconf/nsinstall program + $(MAKE) export ++ # pre-build child dir -> parent dir dependencies ++ # ckfw/builtins -> ckfw ++ IGNORE_DIRS=1 $(MAKE) -C lib/ckfw libs ++ # ckfw/builtins/testlib -> ckfw/builtins + base ++ $(MAKE) -C lib/base libs ++ IGNORE_DIRS=1 $(MAKE) -C lib/ckfw/builtins libs + + all: prepare_build + $(MAKE) libs diff --git a/external/nss/nss-win32-make.patch.1 b/external/nss/nss-win32-make.patch.1 new file mode 100644 index 000000000..7ba3df451 --- /dev/null +++ b/external/nss/nss-win32-make.patch.1 @@ -0,0 +1,20 @@ +--- nss/nss/coreconf/rules.mk.orig2 2014-06-03 15:30:01.667200000 +0200 ++++ nss/nss/coreconf/rules.mk 2014-06-03 15:30:14.537200000 +0200 +@@ -259,7 +259,7 @@ + $(LIBRARY): $(OBJS) | $$(@D)/d + rm -f $@ + ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) +- $(AR) $(subst /,\\,$(OBJS)) ++ $(AR) $(OBJS) + else + $(AR) cr $@ $(OBJS) + endif +@@ -297,7 +297,7 @@ + ifdef NS_USE_GCC + $(LINK_DLL) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES) + else +- $(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)) ++ $(LINK_DLL) -MAP $(DLLBASE) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES) + ifdef MT + if test -f $@.manifest; then \ + $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \ diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch new file mode 100644 index 000000000..4b0c6bfb3 --- /dev/null +++ b/external/nss/nss.aix.patch @@ -0,0 +1,140 @@ +diff -ru a/nspr/configure b/nspr/configure +--- a/a/nspr/configure 2014-09-29 16:47:42.984012225 +0100 ++++ b/b/nspr/configure 2014-09-29 16:50:33.907375937 +0100 +@@ -6369,7 +6369,6 @@ + AIX_LINK_OPTS='-brtl -bnso -berok' + ;; + esac +- CFLAGS="$CFLAGS -qro -qroconst" + AIX_WRAP='$(DIST)/lib/aixwrap.o' + AIX_TMP='./_aix_tmp.o' + if test -n "$USE_64"; then +diff -ru a/nspr/configure.in b/nspr/configure.in +--- a/a/nspr/configure.in 2014-09-29 16:46:35.257394860 +0100 ++++ b/b/nspr/configure.in 2014-09-29 16:50:33.908375942 +0100 +@@ -1229,7 +1229,8 @@ + AC_DEFINE(XP_UNIX) + AC_DEFINE(AIX) + AC_DEFINE(SYSV) +- DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' ++ DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib' ++ MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@' + AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H)) + case "${target_os}" in + aix3.2*) +@@ -1269,10 +1270,9 @@ + AC_DEFINE(HAVE_SOCKLEN_T) + AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) + USE_IPV6=1 +- AIX_LINK_OPTS='-brtl -bnso -berok' ++ AIX_LINK_OPTS='-Wl,-brtl -Wl,-bnso -Wl,-berok' + ;; + esac +- CFLAGS="$CFLAGS -qro -qroconst" + AIX_WRAP='$(DIST)/lib/aixwrap.o' + AIX_TMP='./_aix_tmp.o' + if test -n "$USE_64"; then +diff -ru a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in +--- a/a/nspr/pr/src/Makefile.in 2014-09-29 16:46:35.281395079 +0100 ++++ b/b/nspr/pr/src/Makefile.in 2014-09-29 16:50:33.909375948 +0100 +@@ -74,7 +74,6 @@ + endif # SunOS + + ifeq ($(OS_ARCH),AIX) +-DSO_LDOPTS += -binitfini::_PR_Fini + OS_LIBS = -lodm -lcfg + ifeq ($(CLASSIC_NSPR),1) + ifeq ($(OS_RELEASE),4.1) +diff -ru a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +--- a/a/nss/cmd/platlibs.mk 2014-09-29 16:47:42.987012253 +0100 ++++ b/b/nss/cmd/platlibs.mk 2014-09-29 16:50:33.910375955 +0100 +@@ -134,7 +134,7 @@ + $(NULL) + + ifeq ($(OS_ARCH), AIX) +-EXTRA_SHARED_LIBS += -brtl ++EXTRA_SHARED_LIBS += -Wl,-brtl + endif + + # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) +@@ -180,7 +180,7 @@ + $(NULL) + + ifeq ($(OS_ARCH), AIX) +-EXTRA_SHARED_LIBS += -brtl ++EXTRA_SHARED_LIBS += -Wl,-brtl + endif + + # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) +diff -ru a/nss/cmd/shlibsign/Makefile b/nss/cmd/shlibsign/Makefile +--- a/a/nss/cmd/shlibsign/Makefile 2014-09-29 16:46:35.139393785 +0100 ++++ b/b/nss/cmd/shlibsign/Makefile 2014-09-29 16:50:33.910375955 +0100 +@@ -43,6 +43,9 @@ + + endif + ++ifeq ($(OS), AIX) ++EXTRA_SHARED_LIBS += -lpthreads ++endif + + # sign any and all shared libraries that contain the word freebl + ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1) +diff -ru a/nss/cmd/shlibsign/mangle/Makefile b/nss/cmd/shlibsign/mangle/Makefile +--- a/a/nss/cmd/shlibsign/mangle/Makefile 2014-09-29 16:46:35.139393785 +0100 ++++ b/b/nss/cmd/shlibsign/mangle/Makefile 2014-09-29 16:50:33.910375955 +0100 +@@ -43,7 +43,9 @@ + + endif + +- ++ifeq ($(OS), AIX) ++EXTRA_SHARED_LIBS += -lpthreads ++endif + + ####################################################################### + # (5) Execute "global" rules. (OPTIONAL) # +diff -ru a/nss/coreconf/AIX.mk b/nss/coreconf/AIX.mk +--- a/a/nss/coreconf/AIX.mk 2014-09-29 16:46:35.040392883 +0100 ++++ b/b/nss/coreconf/AIX.mk 2014-09-29 16:50:33.909375948 +0100 +@@ -30,35 +30,30 @@ + + DEFAULT_COMPILER = xlc_r + +-CC = xlc_r +-CCC = xlC_r ++CCC = $(CXX) + + CPU_ARCH = rs6000 + + RANLIB = ranlib + + OS_CFLAGS = -DAIX -DSYSV +-OS_LIBS += -blibpath:/usr/lib:/lib -lc -lm ++OS_LIBS += -Wl,-blibpath:/usr/lib:/lib -lc -lm + +-DSO_LDOPTS = -brtl -bnortllib -bM:SRE -bnoentry +-MKSHLIB = $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm ++DSO_LDOPTS = -Wl,-brtl -Wl,-bnortllib ++MKSHLIB = $(CC) --shared $(DSO_LDOPTS) -Wl,-blibpath:/usr/lib:/lib -lc -lm + + AIX_WRAP = $(DIST)/lib/aixwrap.o + AIX_TMP = $(OBJDIR)/_aix_tmp.o + + ifdef MAPFILE +-DSO_LDOPTS += -bexport:$(MAPFILE) ++DSO_LDOPTS += -Wl,-bexport:$(MAPFILE) + else +-DSO_LDOPTS += -bexpall ++DSO_LDOPTS += -Wl,-bexpall + endif + + PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \ + sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@ + +-ifdef BUILD_OPT +- OPTIMIZER += -qmaxmem=-1 +-endif +- + ifeq ($(USE_64), 1) + OS_CFLAGS += -DAIX_64BIT + OBJECT_MODE=64 diff --git a/external/nss/nss.bzmozilla1238154.patch b/external/nss/nss.bzmozilla1238154.patch new file mode 100644 index 000000000..468ff810b --- /dev/null +++ b/external/nss/nss.bzmozilla1238154.patch @@ -0,0 +1,12 @@ +diff -ru a/nspr/configure b/nspr/configure +--- a/a/nspr/configure 2019-01-26 12:23:06.589389910 +0100 ++++ b/b/nspr/configure 2019-01-26 12:26:56.566222293 +0100 +@@ -7127,7 +7127,7 @@ + + # Determine compiler version + +- _MSVC_VER_FILTER='s|.* \([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p' ++ _MSVC_VER_FILTER='s|.*[^!-~]\([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p' + + CC_VERSION=`${CC} -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"` + if test -z "$CC_VERSION"; then diff --git a/external/nss/nss.cygwin64.in32bit.patch b/external/nss/nss.cygwin64.in32bit.patch new file mode 100644 index 000000000..b00761a0e --- /dev/null +++ b/external/nss/nss.cygwin64.in32bit.patch @@ -0,0 +1,14 @@ +This fixes architecture mismatch, when building +on Cygwin 64bit and in 32bit mode +diff -ru nss.orig/nss/Makefile nss/nss/Makefile +--- a/nss.orig/nss/Makefile 2016-02-26 01:00:52.146713100 +0100 ++++ b/nss/nss/Makefile 2016-02-26 01:02:05.303560100 +0100 +@@ -59,6 +59,8 @@ + # Translate coreconf build options to NSPR configure options. + # + ++NSPR_CONFIGURE_OPTS += --host=i686-pc-cygwin ++ + ifeq ($(OS_TARGET),Android) + NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \ + --target=$(ANDROID_PREFIX) \ diff --git a/external/nss/nss.getopt.patch.0 b/external/nss/nss.getopt.patch.0 new file mode 100644 index 000000000..aeabb33f9 --- /dev/null +++ b/external/nss/nss.getopt.patch.0 @@ -0,0 +1,25 @@ +# pr/tests/sel_spd.c:427:20: error: implicit declaration of function 'getopt' is invalid in C99 [-Werror,-Wimplicit-function-declaration] +--- nspr/pr/tests/sel_spd.c ++++ nspr/pr/tests/sel_spd.c +@@ -15,6 +15,9 @@ + #include <stdio.h> + #include <errno.h> + #include <string.h> ++ ++extern char *optarg; ++int getopt(int argc, char *const argv[], const char *optstring); + + #ifdef DEBUG + #define PORT_INC_DO +100 +--- nspr/pr/tests/testfile.c ++++ nspr/pr/tests/testfile.c +@@ -23,6 +23,9 @@ + #include <getopt.h> + #include <errno.h> + #endif /* XP_OS2 */ ++ ++extern char *optarg; ++int getopt(int argc, char *const argv[], const char *optstring); + + static int _debug_on = 0; + diff --git a/external/nss/nss.nowerror.patch b/external/nss/nss.nowerror.patch new file mode 100644 index 000000000..ff81a9b33 --- /dev/null +++ b/external/nss/nss.nowerror.patch @@ -0,0 +1,12 @@ +diff -ur nss.org/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk +--- a/nss.org/nss/coreconf/WIN32.mk 2016-04-13 11:33:09.322294523 +0200 ++++ b/nss/nss/coreconf/WIN32.mk 2016-04-13 11:33:27.744323969 +0200 +@@ -127,7 +127,7 @@ + -D_CRT_NONSTDC_NO_WARNINGS + OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS + ifndef NSS_ENABLE_WERROR +- NSS_ENABLE_WERROR = 1 ++ NSS_ENABLE_WERROR = 0 + endif + ifeq ($(NSS_ENABLE_WERROR),1) + WARNING_CFLAGS += -WX diff --git a/external/nss/nss.patch b/external/nss/nss.patch new file mode 100644 index 000000000..d9aaee519 --- /dev/null +++ b/external/nss/nss.patch @@ -0,0 +1,155 @@ +--- a/a/nspr/configure 2017-08-29 23:44:13.686045013 +0530 ++++ b/b/nspr/configure 2017-08-29 23:46:53.774768655 +0530 +@@ -7034,7 +7034,7 @@ + PR_MD_CSRCS=linux.c + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' ++ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@) $(if $(filter-out $(OS),ANDROID),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\$$ORIGIN)' + _OPTIMIZE_FLAGS=-O2 + _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that + # combo is not yet good at debugging inlined +--- a/nss.orig/nspr/pr/src/misc/prnetdb.c 2017-08-29 23:44:13.690045031 +0530 ++++ b/nss/nspr/pr/src/misc/prnetdb.c 2017-08-29 23:47:03.810814019 +0530 +@@ -438,7 +438,7 @@ + char *buf = *bufp; + PRIntn buflen = *buflenp; + +- if (align && ((long)buf & (align - 1))) { ++ if (align && ((ptrdiff_t)buf & (align - 1))) { + PRIntn skip = align - ((ptrdiff_t)buf & (align - 1)); + if (buflen < skip) { + return 0; +--- a/a/nss/cmd/platlibs.mk 2017-08-29 23:44:13.554044416 +0530 ++++ b/b/nss/cmd/platlibs.mk 2017-08-29 23:46:09.638569150 +0530 +@@ -10,17 +10,22 @@ + + ifeq ($(OS_ARCH), SunOS) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64' ++#In OOo we would probable put the executables next to libs ++EXTRA_SHARED_LIBS += -R '$$ORIGIN' + else +-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps' ++EXTRA_SHARED_LIBS += -R '$$ORIGIN' + endif + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' + endif + endif + +--- a/nss.org/nss/coreconf/arch.mk 2017-08-29 23:44:13.646044832 +0530 ++++ b/nss/nss/coreconf/arch.mk 2017-08-29 23:45:51.494487134 +0530 +@@ -305,11 +305,17 @@ + OBJDIR_NAME_COMPILER = $(COMPILER_TAG) + endif + OBJDIR_NAME_BASE = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(OBJDIR_NAME_COMPILER)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG) +-OBJDIR_NAME = $(OBJDIR_NAME_BASE).OBJ ++# OBJDIR_NAME is used to build the directory containing the built objects, for ++# example mozilla/dist/Linux2.6_x86_glibc_PTH_DBG.OBJ ++# We need to deliver the contents of that folder into instdir. To make that ++# easier in the makefile we rename this directory to "out". ++#OBJDIR_NAME = $(OBJDIR_NAME_BASE).OBJ ++OBJDIR_NAME = out + + + ifeq (,$(filter-out WIN%,$(OS_TARGET))) +-ifndef BUILD_OPT ++ifdef THIS_HAS_BEEN_DISABLED_TO_GET_out ++ + # + # Define USE_DEBUG_RTL if you want to use the debug runtime library + # (RTL) in the debug build +--- a/nss.org/nss/coreconf/FreeBSD.mk 2017-08-29 23:44:13.642044814 +0530 ++++ b/nss/nss/coreconf/FreeBSD.mk 2017-08-29 23:45:20.850348615 +0530 +@@ -25,6 +25,7 @@ + + DSO_CFLAGS = -fPIC + DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) ++DSO_LDOPTS += -Wl,-z,origin '-Wl,-rpath,$$ORIGIN' + + # + # The default implementation strategy for FreeBSD is pthreads. +--- a/nss.org/nss/coreconf/Linux.mk 2017-08-29 23:44:13.642044814 +0530 ++++ b/nss/nss/coreconf/Linux.mk 2017-08-29 23:47:26.318915759 +0530 +@@ -147,7 +147,7 @@ + # Also, -z defs conflicts with Address Sanitizer, which emits relocations + # against the libsanitizer runtime built into the main executable. + ZDEFS_FLAG = -Wl,-z,defs +-DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) ++DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) $(if $(filter-out $(OS),ANDROID),-Wl$(COMMA)-z$(COMMA)origin '-Wl$(COMMA)-rpath$(COMMA)$$ORIGIN') + LDFLAGS += $(ARCHFLAG) -z noexecstack + + # On Maemo, we need to use the -rpath-link flag for even the standard system +@@ -177,8 +177,13 @@ + endif + endif + ++ifneq ($(SYSTEM_ZLIB),) ++# Currently (3.12.4) only the tools modutil and signtool are linked with libz ++# If USE_SYSTEM_ZLIB is not set then the tools link statically libzlib.a which ++# is also built in nss. + USE_SYSTEM_ZLIB = 1 + ZLIB_LIBS = -lz ++endif + + # The -rpath '$$ORIGIN' linker option instructs this library to search for its + # dependencies in the same directory where it resides. +--- a/nss.org/nss/coreconf/rules.mk 2017-08-29 23:44:13.646044832 +0530 ++++ b/nss/nss/coreconf/rules.mk 2017-08-29 23:47:37.442966042 +0530 +@@ -261,7 +261,7 @@ + ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) + $(AR) $(subst /,\\,$(OBJS)) + else +- $(AR) $(OBJS) ++ $(AR) cr $@ $(OBJS) + endif + $(RANLIB) $@ + +--- a/nss.org/nss/coreconf/SunOS5.mk 2017-08-29 23:44:13.646044832 +0530 ++++ b/nss/nss/coreconf/SunOS5.mk 2017-08-29 23:45:00.902258445 +0530 +@@ -48,8 +48,11 @@ + # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer + endif + else +- CC = cc +- CCC = CC ++ # CC is taken from environment automatically. ++ # CC = cc ++ # Use CXX from environment. ++ # CCC = CC ++ CCC = $(CXX) + ASFLAGS += -Wa,-P + OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) + ifndef BUILD_OPT +--- a/nss.org/nss/coreconf/Werror.mk 2017-08-29 23:44:13.646044832 +0530 ++++ b/nss/nss/coreconf/Werror.mk 2017-08-29 23:44:23.994091608 +0530 +@@ -94,7 +94,8 @@ + endif #ndef NSS_ENABLE_WERROR + + ifeq ($(NSS_ENABLE_WERROR),1) +- WARNING_CFLAGS += -Werror ++ # We do not treat warnings as errors. ++ # WARNING_CFLAGS += -Werror + else + # Old versions of gcc (< 4.8) don't support #pragma diagnostic in functions. + # Use this to disable use of that #pragma and the warnings it suppresses. +--- a/nss.org/nss/Makefile 2017-08-29 23:44:13.402043729 +0530 ++++ b/nss/nss/Makefile 2017-08-29 23:44:39.774162939 +0530 +@@ -1,3 +1,5 @@ ++export AR ++export RANLIB + #! gmake + # + # This Source Code Form is subject to the terms of the Mozilla Public diff --git a/external/nss/nss.utf8bom.patch.1 b/external/nss/nss.utf8bom.patch.1 new file mode 100644 index 000000000..e8c56abef --- /dev/null +++ b/external/nss/nss.utf8bom.patch.1 @@ -0,0 +1,21 @@ +diff -ur nss.org/nss/lib/ckfw/builtins/certdata.perl nss/nss/lib/ckfw/builtins/certdata.perl +--- nss.org/nss/lib/ckfw/builtins/certdata.perl 2016-03-31 18:26:07.890190900 +0800 ++++ nss/nss/lib/ckfw/builtins/certdata.perl 2016-03-31 19:16:16.727269600 +0800 +@@ -110,6 +110,9 @@ + sub doprint { + my $i; + ++print chr(0xEF); ++print chr(0xBB); ++print chr(0xBF); + print <<EOD + /* THIS IS A GENERATED FILE */ + /* This Source Code Form is subject to the terms of the Mozilla Public +@@ -119,6 +122,7 @@ + #ifndef BUILTINS_H + #include "builtins.h" + #endif /* BUILTINS_H */ ++#pragma execution_character_set("utf-8") + + EOD + ; diff --git a/external/nss/nss.vs2015.patch b/external/nss/nss.vs2015.patch new file mode 100644 index 000000000..de4f8762f --- /dev/null +++ b/external/nss/nss.vs2015.patch @@ -0,0 +1,12 @@ +diff -ru nss.org/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk +--- a/nss.org/nss/coreconf/WIN32.mk 2016-02-12 15:36:18.000000000 +0100 ++++ b/nss/nss/coreconf/WIN32.mk 2016-02-26 00:42:43.170809600 +0100 +@@ -199,7 +199,7 @@ + # Disable C4244: conversion from 'type1' to 'type2', possible loss of data + # Disable C4018: 'expression' : signed/unsigned mismatch + # Disable C4312: 'type cast': conversion from 'type1' to 'type2' of greater size +- OS_CFLAGS += -w44267 -w44244 -w44018 -w44312 ++ OS_CFLAGS += -w44267 -w44244 -w44018 -w44312 -wd4996 -wd4554 + ifeq ($(_MSC_VER_GE_12),1) + OS_CFLAGS += -FS + endif diff --git a/external/nss/nss.vs2015.pdb.patch b/external/nss/nss.vs2015.pdb.patch new file mode 100644 index 000000000..c66940132 --- /dev/null +++ b/external/nss/nss.vs2015.pdb.patch @@ -0,0 +1,22 @@ +diff -ru nss.orig/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk +--- a/nss.orig/nss/coreconf/WIN32.mk 2016-03-04 08:30:16.306639400 +0100 ++++ b/nss/nss/coreconf/WIN32.mk 2016-03-04 08:31:17.987233200 +0100 +@@ -169,15 +169,15 @@ + DLLFLAGS += -OUT:$@ + ifdef MOZ_DEBUG_SYMBOLS + ifdef MOZ_DEBUG_FLAGS +- OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd$(OBJDIR)/ ++ OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd./ + else +- OPTIMIZER += -Zi -Fd$(OBJDIR)/ ++ OPTIMIZER += -Zi -Fd./ + endif + DLLFLAGS += -DEBUG -OPT:REF + LDFLAGS += -DEBUG -OPT:REF + endif + else +- OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od ++ OPTIMIZER += -Zi -Fd./ -Od + NULLSTRING := + DEFINES += -DDEBUG -UNDEBUG + DLLFLAGS += -DEBUG -OUT:$@ diff --git a/external/nss/nss.windows.patch b/external/nss/nss.windows.patch new file mode 100644 index 000000000..901846e7b --- /dev/null +++ b/external/nss/nss.windows.patch @@ -0,0 +1,33 @@ +--- a/a/nspr/config/rules.mk 2008-12-03 00:24:39.000000000 +0100 ++++ b/b/nspr/config/rules.mk 2009-11-27 13:36:22.662753328 +0100 +@@ -415,7 +415,7 @@ + + ifdef NEED_ABSOLUTE_PATH + # The quotes allow absolute paths to contain spaces. +-pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))" ++pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell cygpath -m $(1))),$(1),$(shell cygpath -m $(CURDIR)/$(1))))" + endif + + $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp +--- a/a/nss/coreconf/rules.mk 2008-12-03 00:24:39.000000000 +0100 ++++ b/b/nss/coreconf/rules.mk 2009-11-27 13:36:22.662753328 +0100 +@@ -386,7 +386,7 @@ + endif + + # The quotes allow absolute paths to contain spaces. +-core_abspath = '$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))' ++core_abspath = '$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell cygpath -m $(1))),$(1),$(shell cygpath -m $(PWD)/$(1))))' + + $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c | $$(@D)/d + ifdef USE_NT_C_SYNTAX +--- a/a/nspr/pr/include/md/_win95.h ++++ b/b/nspr/pr/include/md/_win95.h +@@ -312,7 +312,7 @@ + #define _MD_ATOMIC_ADD(ptr,val) (InterlockedExchangeAdd((PLONG)ptr, (LONG)val) + val) + #define _MD_ATOMIC_DECREMENT(x) InterlockedDecrement((PLONG)x) + #endif /* x86 */ +-#define _MD_ATOMIC_SET(x,y) InterlockedExchange((PLONG)x, (LONG)y) ++#define _MD_ATOMIC_SET(x,y) _InterlockedExchange((PLONG)x, (LONG)y) + + #define _MD_INIT_IO _PR_MD_INIT_IO + diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch new file mode 100644 index 000000000..c45c5107f --- /dev/null +++ b/external/nss/nss_macosx.patch @@ -0,0 +1,87 @@ +diff -ru a/nspr/configure b/nspr/configure +--- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100 ++++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +0100 +@@ -6577,7 +6579,7 @@ + + + DSO_CFLAGS=-fPIC +- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' ++ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @__________________________________________________OOO/$@ -headerpad_max_install_names' + _OPTIMIZE_FLAGS=-O2 + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + STRIP="$STRIP -x -S" +diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk +--- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100 ++++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100 +@@ -20,13 +24,17 @@ + + ifeq (,$(filter-out i%86,$(CPU_ARCH))) + ifdef USE_64 ++ifeq (,$(findstring -arch ,$(CC))) + CC += -arch x86_64 + CCC += -arch x86_64 ++endif + override CPU_ARCH = x86_64 + else + OS_REL_CFLAGS = -Di386 ++ifeq (,$(findstring -arch ,$(CC))) + CC += -arch i386 + CCC += -arch i386 ++endif + override CPU_ARCH = x86 + endif + else +@@ -40,12 +48,16 @@ + endif + + ifneq (,$(MACOS_SDK_DIR)) ++ CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed -e "s/^.*clang version[ ]*//" | awk '{ print $$1 }') + GCC_VERSION_FULL := $(shell $(CC) -dumpversion) + GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }') + GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }') + GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR) ++ ifneq (,$(CLANG_VERSION_FULL)) ++ DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR) ++ DARWIN_SDK_SHLIBFLAGS = -isysroot $(MACOS_SDK_DIR) + +- ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR))) ++ else ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR))) + # GCC <= 3 + DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks + ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0)) +@@ -108,7 +120,7 @@ + # May override this with different compatibility and current version numbers. + DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1 + # May override this with -bundle to create a loadable module. +-DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names ++DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @__________________________________________________OOO/$(notdir $@) -headerpad_max_install_names + + ifdef USE_GCOV + OS_CFLAGS += --coverage +diff -ru a/nss/Makefile b/nss/Makefile +--- a/a/nss/Makefile 2014-09-29 16:50:22.990304789 +0100 ++++ b/b/nss/Makefile 2014-09-29 16:51:59.207931908 +0100 +@@ -72,6 +72,9 @@ + ifeq ($(OS_TARGET),WIN95) + NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 + endif ++ifdef MACOS_SDK_DIR ++NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) ++endif + ifdef USE_DEBUG_RTL + NSPR_CONFIGURE_OPTS += --enable-debug-rtl + endif +--- a/a/nspr/pr/include/md/_darwin.h ++++ b/b/nspr/pr/include/md/_darwin.h +@@ -40,11 +40,7 @@ + + #undef HAVE_STACK_GROWING_UP + #define HAVE_DLL +-#if defined(__x86_64__) || TARGET_OS_IPHONE + #define USE_DLFCN +-#else +-#define USE_MACH_DYLD +-#endif + #define _PR_HAVE_SOCKADDR_LEN + #define _PR_STAT_HAS_ST_ATIMESPEC + #define _PR_HAVE_LARGE_OFF_T diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0 new file mode 100644 index 000000000..059a9f3b2 --- /dev/null +++ b/external/nss/ubsan.patch.0 @@ -0,0 +1,29 @@ +--- nss/lib/softoken/legacydb/pk11db.c ++++ nss/lib/softoken/legacydb/pk11db.c +@@ -65,7 +65,7 @@ + unsigned char isModuleDBOnly; + unsigned char isCritical; + unsigned char reserved[4]; +- unsigned char names[6]; /* enough space for the length fields */ ++ unsigned char names[1]; /* +5: enough space for the length fields */ + }; + + struct lgdbSlotDataStr { +@@ -148,7 +148,7 @@ + goto loser; + } + +- dataLen = sizeof(lgdbData) + len + len2 + len3 + sizeof(unsigned short) + ++ dataLen = sizeof(lgdbData)+5 + len + len2 + len3 + sizeof(unsigned short) + + count * sizeof(lgdbSlotData); + + data->data = (unsigned char *)PORT_ZAlloc(dataLen); +@@ -327,7 +327,7 @@ + } + if ((encoded->major == LGDB_DB_EXT1_VERSION_MAJOR) && + (encoded->minor >= LGDB_DB_EXT1_VERSION_MINOR)) { +- CHECK_SIZE(sizeof(lgdbData)); ++ CHECK_SIZE(sizeof(lgdbData)+5); + trustOrder = LGDB_GETLONG(encoded->trustOrder); + cipherOrder = LGDB_GETLONG(encoded->cipherOrder); + isModuleDB = (encoded->isModuleDB != 0) ? PR_TRUE : PR_FALSE; diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk new file mode 100644 index 000000000..46e9168f5 --- /dev/null +++ b/external/openldap/ExternalProject_openldap.mk @@ -0,0 +1,56 @@ +# -*- 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,openldap)) + +$(eval $(call gb_ExternalProject_use_externals,openldap,nss3)) + +$(eval $(call gb_ExternalProject_register_targets,openldap,\ + build \ +)) + +openldap_LDFLAGS = +ifeq ($(SYSTEM_NSS),) +openldap_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \ + $(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl) +endif +# Help openldap's configure determine that it needs -lpthread even if libasan.so +# contains a pthread_create override: +ifneq ($(filter -fsanitize=address,$(CC)),) +openldap_LDFLAGS += -pthread +endif + +$(call gb_ExternalProject_get_state_target,openldap,build) : + $(call gb_Trace_StartRange,openldap,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure \ + --disable-slapd \ + --with-pic \ + --with-tls=moznss \ + --without-cyrus-sasl \ + --disable-shared \ + --enable-static \ + $(if $(CROSS_COMPILING), \ + --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + --with-yielding_select=yes \ + ac_cv_func_memcmp_working=yes \ + ) \ + $(if $(SYSTEM_NSS), \ + CPPFLAGS="$(CPPFLAGS) $(NSS_CFLAGS)" CFLAGS="$(CFLAGS) $(NSS_CFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" LDFLAGS="$(LDFLAGS) $(NSS_LIBS)" \ + , \ + CPPFLAGS="$(CPPFLAGS) -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \ + CFLAGS="$(CFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \ + ) \ + $(if $(openldap_LDFLAGS),LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS)") \ + && MAKEFLAGS= && $(MAKE) \ + ) + $(call gb_Trace_EndRange,openldap,EXTERNAL) + + +# vim: set noet sw=4 ts=4: diff --git a/external/openldap/Makefile b/external/openldap/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/openldap/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/openldap/Module_openldap.mk b/external/openldap/Module_openldap.mk new file mode 100644 index 000000000..c6a22bc4e --- /dev/null +++ b/external/openldap/Module_openldap.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,openldap)) + +$(eval $(call gb_Module_add_targets,openldap,\ + ExternalProject_openldap \ + UnpackedTarball_openldap \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/openldap/README b/external/openldap/README new file mode 100644 index 000000000..0c1828c12 --- /dev/null +++ b/external/openldap/README @@ -0,0 +1,3 @@ +OpenLDAP provides an LDAP client library + +http://www.openldap.org/ diff --git a/external/openldap/UnpackedTarball_openldap.mk b/external/openldap/UnpackedTarball_openldap.mk new file mode 100644 index 000000000..61a083ddc --- /dev/null +++ b/external/openldap/UnpackedTarball_openldap.mk @@ -0,0 +1,25 @@ +# -*- 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,openldap)) + +$(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,openldap,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,openldap,\ + build \ + contrib/ldapc++ \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,openldap,\ + external/openldap/openldap-2.4.44.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/openldap/openldap-2.4.44.patch.1 b/external/openldap/openldap-2.4.44.patch.1 new file mode 100644 index 000000000..0d3cf5b70 --- /dev/null +++ b/external/openldap/openldap-2.4.44.patch.1 @@ -0,0 +1,73 @@ +--- openldap.org/configure ++++ openldap/configure +@@ -15735,7 +15735,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnss3 $LIBS" ++LIBS="-lnss3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +--- openldap.org/configure.in ++++ openldap/configure.in +@@ -1239,7 +1239,8 @@ + AC_CHECK_HEADERS([nssutil.h]) + if test "$ac_cv_header_nssutil_h" = yes ; then + AC_CHECK_LIB([nss3], [NSS_Initialize], +- [ have_moznss=yes ], [ have_moznss=no ]) ++ [ have_moznss=yes ], [ have_moznss=no ], ++ [ -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 ]) + fi + + if test "$have_moznss" = yes ; then +--- openldap.org/libraries/libldap/tls_m.c ++++ openldap/libraries/libldap/tls_m.c +@@ -49,17 +49,17 @@ + #include <termios.h> /* for echo on/off */ + #endif + +-#include <nspr/nspr.h> +-#include <nspr/private/pprio.h> +-#include <nss/nss.h> +-#include <nss/ssl.h> +-#include <nss/sslerr.h> +-#include <nss/sslproto.h> +-#include <nss/pk11pub.h> +-#include <nss/secerr.h> +-#include <nss/keyhi.h> +-#include <nss/secmod.h> +-#include <nss/cert.h> ++#include <nspr.h> ++#include <private/pprio.h> ++#include <nss.h> ++#include <ssl.h> ++#include <sslerr.h> ++#include <sslproto.h> ++#include <pk11pub.h> ++#include <secerr.h> ++#include <keyhi.h> ++#include <secmod.h> ++#include <cert.h> + + #undef NSS_VERSION_INT + #define NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \ +--- openldap.org/Makefile.in ++++ openldap/Makefile.in +@@ -13,7 +13,7 @@ + ## top-level directory of the distribution or, alternatively, at + ## <http://www.OpenLDAP.org/license.html>. + +-SUBDIRS= include libraries clients servers tests doc ++SUBDIRS= include libraries + CLEANDIRS= + INSTALLDIRS= + +@@ -32,7 +32,3 @@ + $(RM) config.status libtool stamp-h stamp-h.in + + distclean: veryclean FORCE +- +-check: test +-test: FORCE +- cd tests; $(MAKE) test diff --git a/external/openssl/ExternalPackage_openssl.mk b/external/openssl/ExternalPackage_openssl.mk new file mode 100644 index 000000000..695c7b711 --- /dev/null +++ b/external/openssl/ExternalPackage_openssl.mk @@ -0,0 +1,21 @@ +# -*- 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_ExternalPackage_ExternalPackage,openssl,openssl)) + +$(eval $(call gb_ExternalPackage_use_external_project,openssl,openssl)) + +ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_files,openssl,$(LIBO_LIB_FOLDER),\ + out32dll/ssleay32.dll \ + out32dll/libeay32.dll \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk new file mode 100644 index 000000000..9eaf2cbf6 --- /dev/null +++ b/external/openssl/ExternalProject_openssl.mk @@ -0,0 +1,97 @@ +# -*- 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,openssl)) + +$(eval $(call gb_ExternalProject_register_targets,openssl,\ + build \ +)) + +# For multi-line conditionals, align the $(if and the corresponding ), +# putting the latter on a line of its own. Also put the "else" comma +# on a line of its own. Hopefully should make the logic more clear. + +OPENSSL_PLATFORM := \ + $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\ + $(if $(filter INTEL,$(CPUNAME)),\ + $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf)\ + ,\ + $(if $(filter X86_64,$(CPUNAME)),\ + $(if $(filter GNU/kFreeBSD,$(shell uname)),\ + debian-kfreebsd-amd64\ + ,\ + $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, linux-generic64) no-asm\ + )\ + ,\ + $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32, linux-generic32)\ + )\ + )\ + ,\ + $(if $(filter SOLARIS,$(OS)),\ + $(if $(filter INTEL,$(CPUNAME)),solaris-x86-cc,\ + $(if $(filter X86_64,$(CPUNAME)),solaris64-x86_64-cc,solaris-sparcv9-cc)\ + )\ + ,\ + $(if $(filter iOS,$(OS)),\ + ios-armv7\ + ,\ + $(if $(filter WNT,$(OS)),\ + $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\ + ,\ + $(if $(filter MACOSX,$(OS)),\ + $(if $(filter POWERPC,$(CPUNAME)),darwin-ppc-cc)\ + $(if $(filter INTEL,$(CPUNAME)),darwin-i386-cc)\ + $(if $(filter X86_64,$(CPUNAME)),darwin64-x86_64-cc)\ + $(if $(filter AARCH64,$(CPUNAME)),darwin64-arm64-cc)\ + )\ + )\ + )\ + )\ + ) + +ifeq ($(COM),MSC) +$(eval $(call gb_ExternalProject_use_nmake,openssl,build)) + +$(call gb_ExternalProject_get_state_target,openssl,build): + $(call gb_Trace_StartRange,openssl,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + export PERL="$(shell cygpath -w $(PERL))" \ + && $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \ + && cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \ + && nmake -f "ms\ntdll.mak" \ + && mv inc32/* include/ \ + ) + $(call gb_Trace_EndRange,openssl,EXTERNAL) + +else +$(call gb_ExternalProject_get_state_target,openssl,build): + $(call gb_Trace_StartRange,openssl,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + unset MAKEFLAGS && \ + $(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS iOS,$(OS)), \ + ./Configure, \ + $(if $(filter WNT,$(OS)), \ + $(PERL) Configure, \ + ./config)) \ + $(OPENSSL_PLATFORM) no-dso no-shared \ + $(if $(filter-out WNT,$(OS)),no-idea) \ + $(if $(filter-out ANDROID iOS WNT,$(OS)), \ + $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + && $(MAKE) build_libs \ + CC="$(CC) -fPIC \ + $(if $(filter TRUE, $(ENABLE_DBGUTIL)), -DPURIFY,) \ + $(if $(filter-out WNT MACOSX,$(OS)),-fvisibility=hidden)" \ + && ln -s . lib \ + ) + $(call gb_Trace_EndRange,openssl,EXTERNAL) +# symlink lib dir for python3 +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/openssl/Makefile b/external/openssl/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/openssl/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/openssl/Module_openssl.mk b/external/openssl/Module_openssl.mk new file mode 100644 index 000000000..7a03fe536 --- /dev/null +++ b/external/openssl/Module_openssl.mk @@ -0,0 +1,18 @@ +# -*- 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,openssl)) + +$(eval $(call gb_Module_add_targets,openssl,\ + UnpackedTarball_openssl \ + ExternalPackage_openssl \ + ExternalProject_openssl \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/openssl/README b/external/openssl/README new file mode 100644 index 000000000..399bdd56f --- /dev/null +++ b/external/openssl/README @@ -0,0 +1,7 @@ +Open Source toolkit implementing SSL and TLS. + +From [http://www.openssl.org/]. + +SSL = Secure Sockets Layer (SSL v2/v3) protocol. +TLS = Transport Layer Security (TLS v1) protocol. + diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk new file mode 100644 index 000000000..f399a0417 --- /dev/null +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -0,0 +1,27 @@ +# -*- 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,openssl)) + +$(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl)) + +$(eval $(call gb_UnpackedTarball_add_patches,openssl,\ + external/openssl/openssllnx.patch \ + external/openssl/opensslwnt.patch \ + $(if $(filter INTEL,$(CPUNAME)),external/openssl/opensslwnt_safeseh.patch) \ + external/openssl/openssl-1.0.1h-win64.patch.1 \ + external/openssl/opensslsol.patch \ + external/openssl/opensslios.patch \ + external/openssl/opensslosxppc.patch \ + external/openssl/openssl-3650-masm.patch.1 \ + external/openssl/openssl-fixbuild.patch.1 \ + external/openssl/openssl-macos-arm64.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/openssl/openssl-1.0.1h-win64.patch.1 b/external/openssl/openssl-1.0.1h-win64.patch.1 new file mode 100644 index 000000000..aea914633 --- /dev/null +++ b/external/openssl/openssl-1.0.1h-win64.patch.1 @@ -0,0 +1,47 @@ +diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat +index 8768dc6..6772390 100755 +--- a/ms/do_win64a.bat ++++ b/ms/do_win64a.bat +@@ -1,19 +1,19 @@ +-perl util\mkfiles.pl >MINFO ++perl util/mkfiles.pl >MINFO + + cmd /c "nasm -f win64 -v" >NUL 2>&1 + if %errorlevel% neq 0 goto ml64 + +-perl ms\uplink-x86_64.pl nasm > ms\uptable.asm +-nasm -f win64 -o ms\uptable.obj ms\uptable.asm ++perl ms/uplink-x86_64.pl nasm > ms/uptable.asm ++nasm -f win64 -o ms/uptable.obj ms/uptable.asm + goto proceed + + :ml64 +-perl ms\uplink-x86_64.pl masm > ms\uptable.asm +-ml64 -c -Foms\uptable.obj ms\uptable.asm ++perl ms/uplink-x86_64.pl masm > ms/uptable.asm ++ml64 -c -Foms/uptable.obj ms/uptable.asm + + :proceed +-perl util\mk1mf.pl VC-WIN64A >ms\nt.mak +-perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak ++perl util/mk1mf.pl VC-WIN64A >ms/nt.mak ++perl util/mk1mf.pl dll VC-WIN64A >ms/ntdll.mak + +-perl util\mkdef.pl 32 libeay > ms\libeay32.def +-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def ++perl util/mkdef.pl 32 libeay > ms/libeay32.def ++perl util/mkdef.pl 32 ssleay > ms/ssleay32.def +diff --git a/util/mk1mf.pl b/util/mk1mf.pl +index 72fa089..d98def1 100755 +--- a/util/mk1mf.pl ++++ b/util/mk1mf.pl +@@ -233,6 +233,9 @@ else + $cflags.=' -DTERMIO'; + } + ++# force unix style path separator ++${o} = "/"; ++ + $fipsdir =~ s/\//${o}/g; + + $out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":""); diff --git a/external/openssl/openssl-3650-masm.patch.1 b/external/openssl/openssl-3650-masm.patch.1 new file mode 100644 index 000000000..97f1eb644 --- /dev/null +++ b/external/openssl/openssl-3650-masm.patch.1 @@ -0,0 +1,35 @@ +diff --git a/crypto/perlasm/x86masm.pl b/crypto/perlasm/x86masm.pl +index 1741342..917d0f8 100644 +--- a/crypto/perlasm/x86masm.pl ++++ b/crypto/perlasm/x86masm.pl +@@ -18,10 +18,10 @@ sub ::generic + + if ($opcode =~ /lea/ && @arg[1] =~ s/.*PTR\s+(\(.*\))$/OFFSET $1/) # no [] + { $opcode="mov"; } +- elsif ($opcode !~ /movq/) ++ elsif ($opcode !~ /mov[dq]$/) + { # fix xmm references +- $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i); +- $arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i); ++ $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[-1]=~/\bxmm[0-7]\b/i); ++ $arg[-1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i); + } + + &::emit($opcode,@arg); +@@ -160,13 +160,13 @@ sub ::public_label + { push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n"); } + + sub ::data_byte +-{ push(@out,("DB\t").join(',',@_)."\n"); } ++{ push(@out,("DB\t").join(',',splice(@_,0,16))."\n") while(@_); } + + sub ::data_short +-{ push(@out,("DW\t").join(',',@_)."\n"); } ++{ push(@out,("DW\t").join(',',splice(@_,0,8))."\n") while(@_); } + + sub ::data_word +-{ push(@out,("DD\t").join(',',@_)."\n"); } ++{ push(@out,("DD\t").join(',',splice(@_,0,4))."\n") while(@_); } + + sub ::align + { push(@out,"ALIGN\t$_[0]\n"); } diff --git a/external/openssl/openssl-fixbuild.patch.1 b/external/openssl/openssl-fixbuild.patch.1 new file mode 100644 index 000000000..5a986e872 --- /dev/null +++ b/external/openssl/openssl-fixbuild.patch.1 @@ -0,0 +1,23 @@ +--- a/crypto/evp/Makefile ++++ b/crypto/evp/Makefile +@@ -289,7 +289,7 @@ + e_idea.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h + e_idea.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h + e_idea.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +-e_idea.o: ../../include/openssl/evp.h ../../include/openssl/idea.h ++e_idea.o: ../../include/openssl/evp.h ../idea/idea.h + e_idea.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h + e_idea.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h + e_idea.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +--- a/util/mklink.pl ++++ b/util/mklink.pl +@@ -50,8 +50,7 @@ + my $to = join('/', @to_path); + + my $file; +-$symlink_exists=eval {symlink("",""); 1}; +-if ($^O eq "msys") { $symlink_exists=0 }; ++$symlink_exists=0; + foreach $file (@files) { + my $err = ""; + if ($symlink_exists) { diff --git a/external/openssl/openssl-macos-arm64.patch.1 b/external/openssl/openssl-macos-arm64.patch.1 new file mode 100644 index 000000000..f0be9dbab --- /dev/null +++ b/external/openssl/openssl-macos-arm64.patch.1 @@ -0,0 +1,13 @@ +-*- Mode: diff -*- + +--- a/Configure ++++ b/Configure +@@ -620,6 +620,8 @@ + "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin64-arm64-cc","cc:-arch arm64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"debug-darwin64-arm64-cc","cc:-arch arm64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + # iPhoneOS/iOS + "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", diff --git a/external/openssl/opensslios.patch b/external/openssl/opensslios.patch new file mode 100644 index 000000000..e3e1c2184 --- /dev/null +++ b/external/openssl/opensslios.patch @@ -0,0 +1,12 @@ +--- misc/openssl-0.9.8v/Configure ++++ build/openssl-0.9.8v/Configure +@@ -530,6 +530,9 @@ + # iPhoneOS/iOS + "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + ++##### iOS in the LibreOffice case ++"ios-armv7","gcc:-O3 -fomit-frame-pointer -DL_ENDIAN:::IOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:::::", ++ + ##### A/UX + "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", + diff --git a/external/openssl/openssllnx.patch b/external/openssl/openssllnx.patch new file mode 100644 index 000000000..224df8f87 --- /dev/null +++ b/external/openssl/openssllnx.patch @@ -0,0 +1,23 @@ +--- build/openssl-0.9.8v/Configure-old 2010-04-17 13:51:42.000000000 +0200 ++++ build/openssl-0.9.8v/Configure 2010-04-17 13:52:03.000000000 +0200 +@@ -388,6 +388,9 @@ + + "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + ++"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", + "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", + +--- build/openssl-0.9.8v/Makefile.org 2010-01-27 17:06:36.000000000 +0100 ++++ build/openssl-0.9.8v/Makefile.org 2010-09-20 09:24:00.000000000 +0100 +@@ -206,7 +206,7 @@ + # same language for uniform treatment. + BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ + CC='$(CC)' CFLAG='$(CFLAG)' \ +- AS='$(CC)' ASFLAG='$(CFLAG) -c' \ ++ AS='$(CC)' ASFLAG='$(CFLAG) -c -Wa,--noexecstack' \ + AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \ + RC='$(RC)' \ + CROSS_COMPILE='$(CROSS_COMPILE)' \ diff --git a/external/openssl/opensslosxppc.patch b/external/openssl/opensslosxppc.patch new file mode 100644 index 000000000..2e9168e8b --- /dev/null +++ b/external/openssl/opensslosxppc.patch @@ -0,0 +1,15 @@ +-*- Mode: diff -*- + +--- a/openssl/Configure ++++ b/openssl/Configure +@@ -620,8 +620,8 @@ + + ##### MacOS X (a.k.a. Rhapsody or Darwin) setup + "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", +-"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin-ppc-cc","cc:-m32 -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin64-ppc-cc","cc:-m64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", diff --git a/external/openssl/opensslsol.patch b/external/openssl/opensslsol.patch new file mode 100644 index 000000000..6122b67c9 --- /dev/null +++ b/external/openssl/opensslsol.patch @@ -0,0 +1,20 @@ +--- misc/openssl-0.9.8v/Makefile.shared Wed Sep 17 17:56:40 2008 ++++ build/openssl-0.9.8v/Makefile.shared Fri Mar 26 16:04:41 2010 +@@ -95,7 +95,7 @@ + LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ +- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ ++ LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \ + $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} ) + + LINK_SO= \ +@@ -105,7 +105,7 @@ + SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ +- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ ++ LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \ + $${SHAREDCMD} $${SHAREDFLAGS} \ + -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ + $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ diff --git a/external/openssl/opensslwnt.patch b/external/openssl/opensslwnt.patch new file mode 100644 index 000000000..e22bea6f0 --- /dev/null +++ b/external/openssl/opensslwnt.patch @@ -0,0 +1,167 @@ +diff -ru openssl.orig/crypto/x509v3/v3_pci.c openssl/crypto/x509v3/v3_pci.c +--- a/openssl.orig/crypto/x509v3/v3_pci.c 2016-03-01 14:35:05.000000000 +0100 ++++ b/openssl/crypto/x509v3/v3_pci.c 2016-03-03 20:27:42.195914432 +0100 +@@ -3,7 +3,7 @@ + * Contributed to the OpenSSL Project 2004 by Richard Levitte + * (richard@levitte.org) + */ +-/* Copyright (c) 2004 Kungliga Tekniska Högskolan ++/* Copyright (c) 2004 Kungliga Tekniska Hoegskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * +diff -ru openssl.orig/crypto/x509v3/v3_pcia.c openssl/crypto/x509v3/v3_pcia.c +--- a/openssl.orig/crypto/x509v3/v3_pcia.c 2016-03-01 14:35:05.000000000 +0100 ++++ b/openssl/crypto/x509v3/v3_pcia.c 2016-03-03 20:27:56.495913984 +0100 +@@ -3,7 +3,7 @@ + * Contributed to the OpenSSL Project 2004 by Richard Levitte + * (richard@levitte.org) + */ +-/* Copyright (c) 2004 Kungliga Tekniska Högskolan ++/* Copyright (c) 2004 Kungliga Tekniska Hoegskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * +diff -ru openssl.orig/ms/do_ms.bat openssl/ms/do_ms.bat +--- a/openssl.orig/ms/do_ms.bat 2015-01-15 15:43:14.000000000 +0100 ++++ b/openssl/ms/do_ms.bat 2016-03-03 20:31:09.355907935 +0100 +@@ -1,11 +1,11 @@ + +-perl util\mkfiles.pl >MINFO +-perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak +-perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak +-if x%OSVERSION% == x goto skipce +-perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak +-perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak +-:skipce ++%1 util\mkfiles.pl >MINFO ++if %2 == VC-WIN32 goto not64a ++perl ms\uplink.pl win64a > ms\uptable.asm ++ml64 -c -Foms\uptable.obj ms\uptable.asm ++:not64a ++%1 util\mk1mf.pl no-asm %2 >ms\nt.mak ++%1 util\mk1mf.pl dll no-asm %2 >ms\ntdll.mak + +-perl util\mkdef.pl 32 libeay > ms\libeay32.def +-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def ++%1 util\mkdef.pl 32 libeay > ms\libeay32.def ++%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def +diff -ru openssl.orig/util/mk1mf.pl openssl/util/mk1mf.pl +--- a/openssl.orig/util/mk1mf.pl 2016-03-03 20:22:21.043924505 +0100 ++++ b/openssl/util/mk1mf.pl 2016-03-03 20:34:45.015901171 +0100 +@@ -163,7 +163,7 @@ + $inc_def="outinc"; + $tmp_def="tmp"; + +-$perl="perl" unless defined $perl; ++$perl="$ENV{PERL}" unless defined $perl; + $mkdir="-mkdir" unless defined $mkdir; + + ($ssl,$crypto)=("ssl","crypto"); +@@ -347,6 +347,11 @@ + s/\s*$//; # was chop, didn't work in mixture of perls for Windows... + + ($key,$val)=/^([^=]+)=(.*)/; ++ ++ # On some Windows machines, $val has linefeeds at the end, which confuses ++ # subsequent code in this file. So we strip all whitespace at the end. ++ $val =~ s/\s+$//; ++ + if ($key eq "RELATIVE_DIRECTORY") + { + if ($lib ne "") +@@ -473,7 +478,7 @@ + # Set your compiler options + PLATFORM=$platform + CC=$bin_dir${cc} +-CFLAG=$cflags ++CFLAG=$cflags \$(SOLARINC) + APP_CFLAG=$app_cflag + LIB_CFLAG=$lib_cflag + SHLIB_CFLAG=$shl_cflag +@@ -488,7 +493,7 @@ + + LINK_CMD=$link + LFLAGS=$lflags +-RSC=$rsc ++RSC=$rsc \$(SOLARINC) + + # The output directory for everything interesting + OUT_D=$out_dir +@@ -669,7 +674,7 @@ + printf OUT <<EOF; + #ifdef $platform_cpp_symbol + /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */ +- #define CFLAGS "compiler: $cc $cflags" ++ #define CFLAGS "compiler: $cflags" + #define PLATFORM "$platform" + EOF + printf OUT " #define DATE \"%s\"\n", scalar gmtime(); +diff -ru openssl.orig/util/pl/VC-32.pl openssl/util/pl/VC-32.pl +--- a/openssl.orig/util/pl/VC-32.pl 2016-03-01 14:35:53.000000000 +0100 ++++ b/openssl/util/pl/VC-32.pl 2016-03-03 21:15:14.083824986 +0100 +@@ -30,7 +30,7 @@ + my $ff = ""; + + # C compiler stuff +-$cc='cl'; ++$cc=$ENV{'CC'}; + if ($FLAVOR =~ /WIN64/) + { + # Note that we currently don't have /WX on Win64! There is a lot of +@@ -114,7 +114,7 @@ + } + + $cc=($ENV{CC} or "cl"); +- $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT'; ++ $base_cflags=' -W3 -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT'; + $base_cflags.=" $wcecdefs"; + $base_cflags.=' -I$(WCECOMPAT)/include' if (defined($ENV{'WCECOMPAT'})); + $base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include' if (defined($ENV{'PORTSDK_LIBPATH'})); +@@ -123,20 +123,21 @@ + } else { + $base_cflags.=' /MC'; + } +- $opt_cflags=' /O1i'; # optimize for space, but with intrinsics... +- $dbg_cflags=' /Od -DDEBUG -D_DEBUG'; ++ $opt_cflags=' -O1i'; # optimize for space, but with intrinsics... ++ $dbg_cflags=' -Od -DDEBUG -D_DEBUG'; ++ + $lflags="/nologo /opt:ref $wcelflag"; + } + else # Win32 + { + $base_cflags= " $mf_cflag"; +- my $f = $shlib || $fips ?' /MD':' /MT'; ++ my $f = $shlib || $fips ? (($ENV{MSVC_USE_DEBUG_RUNTIME} eq "TRUE") ? ' -MDd' : ' -MD' ):' -MT'; + $ff = "/fixed"; +- $opt_cflags=$f.' /Ox /O2 /Ob2'; +- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; ++ $opt_cflags=$f.' -Ox -O2 -Ob2'; ++ $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG'; + $lflags="/nologo /subsystem:console /opt:ref"; + } +-$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib ++$lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib + $mlflags=''; + + $out_def ="out32"; $out_def.="dll" if ($shlib); +@@ -161,7 +162,7 @@ + + $obj='.obj'; + $asm_suffix='.asm'; +-$ofile="/Fo"; ++$ofile="-Fo.\\"; + + # EXE linking stuff + $link="link"; +diff -ru openssl.orig/ms/uplink.c openssl/ms/uplink.c +--- a/openssl.orig/ms/uplink.c 2015-03-19 15:02:02.000000000 +0100 ++++ b/openssl/ms/uplink.c 2016-03-03 20:39:19.403892565 +0100 +@@ -1,5 +1,6 @@ + #if (defined(_WIN64) || defined(_WIN32_WCE)) && !defined(UNICODE) + # define UNICODE ++# define _CRT_NON_CONFORMING_SWPRINTFS + #endif + #if defined(UNICODE) && !defined(_UNICODE) + # define _UNICODE diff --git a/external/openssl/opensslwnt_safeseh.patch b/external/openssl/opensslwnt_safeseh.patch new file mode 100644 index 000000000..f2eafab5b --- /dev/null +++ b/external/openssl/opensslwnt_safeseh.patch @@ -0,0 +1,23 @@ +use /safeseh in 32-bit MSVC builds; this is not required for 64-bit + +diff -ru openssl.orig/util/mk1mf.pl openssl/util/mk1mf.pl +--- a/openssl.orig/util/mk1mf.pl 2016-03-03 20:22:21.043924505 +0100 ++++ b/openssl/util/mk1mf.pl 2016-03-03 20:34:45.015901171 +0100 +@@ -488,7 +493,7 @@ + SRC_D=$src_dir + + LINK_CMD=$link +-LFLAGS=$lflags ++LFLAGS=$lflags /SAFESEH + RSC=$rsc \$(SOLARINC) + + # The output directory for everything interesting +@@ -511,7 +516,7 @@ + MKDIR=$mkdir + MKLIB=$bin_dir$mklib + MLFLAGS=$mlflags +-ASM=$bin_dir$asm ++ASM=$bin_dir$asm /safeseh + + # FIPS validated module and support file locations + diff --git a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk new file mode 100644 index 000000000..149becee9 --- /dev/null +++ b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk @@ -0,0 +1,23 @@ +# -*- 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,owncloud_android_lib)) + +$(eval $(call gb_ExternalProject_register_targets,owncloud_android_lib,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,owncloud_android_lib,build) : + $(call gb_Trace_StartRange,owncloud_android_lib,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ANDROID_HOME=$(ANDROID_SDK_HOME) $(SRCDIR)/android/source/gradlew assemble \ + ) + $(call gb_Trace_EndRange,owncloud_android_lib,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/owncloud-android-lib/Makefile b/external/owncloud-android-lib/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/owncloud-android-lib/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/owncloud-android-lib/Module_owncloud-android-lib.mk b/external/owncloud-android-lib/Module_owncloud-android-lib.mk new file mode 100644 index 000000000..486ed4053 --- /dev/null +++ b/external/owncloud-android-lib/Module_owncloud-android-lib.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,owncloud_android_lib)) + +$(eval $(call gb_Module_add_targets,owncloud_android_lib, \ + ExternalProject_owncloud_android_lib \ + UnpackedTarball_owncloud_android_lib \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/owncloud-android-lib/README b/external/owncloud-android-lib/README new file mode 100644 index 000000000..921619d63 --- /dev/null +++ b/external/owncloud-android-lib/README @@ -0,0 +1,7 @@ +Library required to access ownCloud servers from Android. + +Code from https://github.com/jaragunde/owncloud-android-library, release 0.9.4. +Notice it is a fork from the official repository at +https://github.com/owncloud/android-library, the test and example projects have +been removed and the binary jars have been replaced with the sources of the +required libraries. diff --git a/external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk b/external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk new file mode 100644 index 000000000..b9038cd1c --- /dev/null +++ b/external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.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/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,owncloud_android_lib)) + +$(eval $(call gb_UnpackedTarball_set_tarball,owncloud_android_lib,$(OWNCLOUD_ANDROID_LIB_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_file,owncloud_android_lib,build.gradle,external/owncloud-android-lib/build.gradle)) + +# vim: set noet sw=4 ts=4: diff --git a/external/owncloud-android-lib/build.gradle b/external/owncloud-android-lib/build.gradle new file mode 100644 index 000000000..9203dc45a --- /dev/null +++ b/external/owncloud-android-lib/build.gradle @@ -0,0 +1,57 @@ +apply plugin: 'com.android.library' +buildscript { + repositories { + jcenter() + google() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.1.3' + } +} + +allprojects { + repositories { + jcenter() + google() + } +} + +android { + useLibrary 'org.apache.http.legacy' + + compileOptions { + encoding 'ISO8859-1' + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + compileSdkVersion 26 + buildToolsVersion "27.0.3" + + defaultConfig { + minSdkVersion 16 + targetSdkVersion 26 + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java { + srcDirs = [ + 'libs/commons-codec-1.9/src/main/java', + 'libs/commons-httpclient-3.1/src/java', + 'libs/jackrabbit-webdav-2.7.2/src/main/java', + 'libs/slf4j-1.7.12/src/java', + 'libs/tomcat-7.0.40/java', + 'src' + ] + } + resources { + srcDirs = [ + 'libs/tomcat-7.0.40/java', + 'libs/jackrabbit-webdav-2.7.2/src/main/java' + ] + } + } + } +} diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk new file mode 100644 index 000000000..f08ff51a3 --- /dev/null +++ b/external/pdfium/Library_pdfium.mk @@ -0,0 +1,692 @@ +# -*- 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_Library_Library,pdfium)) + +$(eval $(call gb_Library_use_unpacked,pdfium,pdfium)) + +$(eval $(call gb_Library_set_warnings_disabled,pdfium)) + +$(eval $(call gb_Library_set_precompiled_header,pdfium,external/pdfium/inc/pch/precompiled_pdfium)) + +$(eval $(call gb_Library_set_include,pdfium,\ + -I$(call gb_UnpackedTarball_get_dir,pdfium) \ + -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party \ + -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/agg23 \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,pdfium,\ + -DFPDF_IMPLEMENTATION \ + -DUSE_SYSTEM_LCMS2 \ + -DUSE_SYSTEM_LIBJPEG \ + -DUSE_SYSTEM_ZLIB \ + -DUSE_SYSTEM_ICUUC \ + -DMEMORY_TOOL_REPLACES_ALLOCATOR \ + -DUNICODE \ + -DWIN32_LEAN_AND_MEAN \ + -DCOMPONENT_BUILD \ +)) + +$(eval $(call gb_Library_set_generated_cxx_suffix,pdfium,cpp)) + +# pdfium +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_annot \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_annothandlermgr \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_annotiteration \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_baannot \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_baannothandler \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_formfillenvironment \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_pageview \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_widget \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_widgethandler \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_dataavail \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_ext \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_flatten \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_progressive \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_searchex \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_structtree \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_sysfontinfo \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_transformpage \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_actionhandler \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_annotiterator \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_customaccess \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_fieldaction \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_filewriteadapter \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_helpers \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_annot \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_attachment \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_catalog \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_doc \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_editimg \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_editpage \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_editpath \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_edittext \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_formfill \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_save \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_text \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_view \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_pauseadapter \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_interactiveform \ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_renderpage \ + UnpackedTarball/pdfium/fpdfsdk/fpdf_signature \ +)) + +# fdrm +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fdrm/fx_crypt \ + UnpackedTarball/pdfium/core/fdrm/fx_crypt_aes \ + UnpackedTarball/pdfium/core/fdrm/fx_crypt_sha \ +)) + +# formfiller +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_checkbox \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_combobox \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_formfiller \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_interactiveformfiller \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_listbox \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_pushbutton \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_radiobutton \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_textfield \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_button \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_textobject \ + UnpackedTarball/pdfium/fpdfsdk/formfiller/cffl_privatedata \ +)) + +# fpdfapi +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/Adobe-CNS1-UCS2_5 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/B5pc-H_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/B5pc-V_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/CNS-EUC-H_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/CNS-EUC-V_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/ETen-B5-H_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/ETen-B5-V_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/ETenms-B5-H_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/ETenms-B5-V_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/HKscs-B5-H_5 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/HKscs-B5-V_5 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-H_3 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/UniCNS-UCS2-V_3 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/UniCNS-UTF16-H_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/CNS1/cmaps_cns1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/Adobe-GB1-UCS2_5 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/GB-EUC-H_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/GB-EUC-V_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/GBK-EUC-H_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/GBK-EUC-V_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/GBK2K-H_5 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/GBK2K-V_5 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/GBKp-EUC-H_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/GBKp-EUC-V_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/GBpc-EUC-H_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/GBpc-EUC-V_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/UniGB-UCS2-H_4 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/UniGB-UCS2-V_4 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/GB1/cmaps_gb1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/83pv-RKSJ-H_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-H_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/90ms-RKSJ-V_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-H_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/90msp-RKSJ-V_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/90pv-RKSJ-H_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/Add-RKSJ-H_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/Add-RKSJ-V_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/Adobe-Japan1-UCS2_4 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/EUC-H_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/EUC-V_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-H_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/Ext-RKSJ-V_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/H_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-H_4 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-HW-V_4 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-H_4 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/UniJIS-UCS2-V_4 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/V_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Japan1/cmaps_japan1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/Adobe-Korea1-UCS2_2 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/KSC-EUC-H_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/KSC-EUC-V_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-H_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/KSCms-UHC-HW-V_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/KSCms-UHC-H_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/KSCms-UHC-V_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/KSCpc-EUC-H_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-H_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/UniKS-UCS2-V_1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/UniKS-UTF16-H_0 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/Korea1/cmaps_korea1 \ + UnpackedTarball/pdfium/core/fpdfapi/cmaps/fpdf_cmaps \ + UnpackedTarball/pdfium/core/fpdfapi/edit/cpdf_pagecontentgenerator \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_cidfont \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_font \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_fontencoding \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_simplefont \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_truetypefont \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_type1font \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_type3char \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_type3font \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_allstates \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_clippath \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_color \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_colorspace \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_colorstate \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_contentmarks \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_contentmarkitem \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_contentparser \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_docpagedata \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_form \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_formobject \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_generalstate \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_graphicstates \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_image \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_imageobject \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_meshstream \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_page \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_pagemodule \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_pageobject \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_pageobjectholder \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_path \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_pathobject \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_pattern \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_shadingobject \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_shadingpattern \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_streamcontentparser \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_streamparser \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_textobject \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_textstate \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_tilingpattern \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cfdf_document \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_array \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_boolean \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_crypto_handler \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_data_avail \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_dictionary \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_document \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_hint_tables \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_indirect_object_holder \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_linearized_header \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_name \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_null \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_number \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_object \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_parser \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_reference \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_security_handler \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_simple_parser \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_stream \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_stream_acc \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_string \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_syntax_parser \ + UnpackedTarball/pdfium/core/fpdfapi/parser/fpdf_parser_decode \ + UnpackedTarball/pdfium/core/fpdfapi/parser/fpdf_parser_utility \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_object_walker \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_read_validator \ + UnpackedTarball/pdfium/core/fpdfapi/render/charposlist \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_devicebuffer \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_docrenderdata \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_imagecacheentry \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_imageloader \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_imagerenderer \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_pagerendercache \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_progressiverenderer \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_rendercontext \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_renderoptions \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_renderstatus \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_scaledrenderbuffer \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_textrenderer \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_type3cache \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_type3glyphmap \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_rendershading \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_rendertiling \ + UnpackedTarball/pdfium/core/fpdfapi/edit/cpdf_creator \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_encryptor \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_flateencoder \ + UnpackedTarball/pdfium/core/fpdfapi/font/cfx_cttgsubtable \ + UnpackedTarball/pdfium/core/fpdfapi/font/cfx_stockfontarray \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_cid2unicodemap \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_cmap \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_cmapmanager \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_cmapparser \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_fontglobals \ + UnpackedTarball/pdfium/core/fpdfapi/font/cpdf_tounicodemap \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_devicecs \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_expintfunc \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_function \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_iccprofile \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_patterncs \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_psengine \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_psfunc \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_sampledfunc \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_stitchfunc \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_object_avail \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_page_object_avail \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_cross_ref_avail \ + UnpackedTarball/pdfium/core/fpdfapi/edit/cpdf_pagecontentmanager \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_transparency \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_dib \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_object_stream \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_cross_ref_table \ + UnpackedTarball/pdfium/core/fpdfapi/edit/cpdf_stringarchivestream \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_occontext \ + UnpackedTarball/pdfium/core/fpdfapi/edit/cpdf_contentstream_write_utils \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_annotcontext \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_pagerendercontext \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_transferfuncdib \ + UnpackedTarball/pdfium/core/fpdfapi/page/cpdf_transferfunc \ +)) + +# fpdfdoc +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fpdfdoc/cline \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_aaction \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_action \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_annot \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_annotlist \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_apsettings \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_bookmark \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_bookmarktree \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_defaultappearance \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_dest \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_filespec \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_formcontrol \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_formfield \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_iconfit \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_interactiveform \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_link \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_linklist \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_metadata \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_nametree \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_numbertree \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_pagelabel \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_variabletext \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_viewerpreferences \ + UnpackedTarball/pdfium/core/fpdfdoc/cpvt_fontmap \ + UnpackedTarball/pdfium/core/fpdfdoc/cpvt_generateap \ + UnpackedTarball/pdfium/core/fpdfdoc/cpvt_wordinfo \ + UnpackedTarball/pdfium/core/fpdfdoc/csection \ + UnpackedTarball/pdfium/core/fpdfdoc/ctypeset \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_structelement \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_structtree \ + UnpackedTarball/pdfium/core/fpdfdoc/cba_fontmap \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_color_utils \ + UnpackedTarball/pdfium/core/fpdfdoc/cpdf_icon \ +)) + +# fpdftext +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fpdftext/cpdf_linkextract \ + UnpackedTarball/pdfium/core/fpdftext/cpdf_textpage \ + UnpackedTarball/pdfium/core/fpdftext/cpdf_textpagefind \ + UnpackedTarball/pdfium/core/fpdftext/unicodenormalizationdata \ +)) + +# fxcodec +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fxcodec/fx_codec \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_ArithDecoder \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_ArithIntDecoder \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_BitStream \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_Context \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_GrdProc \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_GrrdProc \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_HtrdProc \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_HuffmanDecoder \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_HuffmanTable \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_Image \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_PatternDict \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_PddProc \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_SddProc \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_Segment \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_SymbolDict \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_TrdProc \ + UnpackedTarball/pdfium/core/fxcodec/gif/cfx_gif \ + UnpackedTarball/pdfium/core/fxcodec/gif/cfx_lzwdecompressor \ + UnpackedTarball/pdfium/core/fxcodec/cfx_codec_memory \ + UnpackedTarball/pdfium/core/fxcodec/fax/faxmodule \ + UnpackedTarball/pdfium/core/fxcodec/scanlinedecoder \ + UnpackedTarball/pdfium/core/fxcodec/jpeg/jpegmodule \ + UnpackedTarball/pdfium/core/fxcodec/jpx/cjpx_decoder \ + UnpackedTarball/pdfium/core/fxcodec/jpx/jpx_decode_utils \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext \ + UnpackedTarball/pdfium/core/fxcodec/basic/basicmodule \ + UnpackedTarball/pdfium/core/fxcodec/flate/flatemodule \ + UnpackedTarball/pdfium/core/fxcodec/icc/iccmodule \ + UnpackedTarball/pdfium/core/fxcodec/jbig2/jbig2_decoder \ + UnpackedTarball/pdfium/core/fxcodec/jpeg/jpeg_common \ +)) + +# fxcrt +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fxcrt/cfx_memorystream \ + UnpackedTarball/pdfium/core/fxcrt/cfx_seekablestreamproxy \ + UnpackedTarball/pdfium/core/fxcrt/fx_bidi \ + UnpackedTarball/pdfium/core/fxcrt/fx_coordinates \ + UnpackedTarball/pdfium/core/fxcrt/fx_extension \ + UnpackedTarball/pdfium/core/fxcrt/fx_memory \ + UnpackedTarball/pdfium/core/fxcrt/fx_stream \ + UnpackedTarball/pdfium/core/fxcrt/fx_system \ + UnpackedTarball/pdfium/core/fxcrt/fx_unicode \ + UnpackedTarball/pdfium/core/fxcrt/xml/cfx_xmldocument \ + UnpackedTarball/pdfium/core/fxcrt/xml/cfx_xmlelement \ + UnpackedTarball/pdfium/core/fxcrt/xml/cfx_xmlparser \ + UnpackedTarball/pdfium/core/fxcrt/xml/cfx_xmlnode \ + UnpackedTarball/pdfium/core/fxcrt/xml/cfx_xmlinstruction \ + UnpackedTarball/pdfium/core/fxcrt/xml/cfx_xmltext \ + UnpackedTarball/pdfium/core/fxcrt/xml/cfx_xmlchardata \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_csscolorvalue \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_csscomputedstyle \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_csscustomproperty \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssdeclaration \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssenumvalue \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssexttextbuf \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssnumbervalue \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_csspropertyholder \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssrulecollection \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssselector \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssstringvalue \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssstylerule \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssstyleselector \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssstylesheet \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_csssyntaxparser \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_csstextbuf \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssvalue \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssvaluelist \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssvaluelistparser \ + UnpackedTarball/pdfium/core/fxcrt/cfx_datetime \ + UnpackedTarball/pdfium/core/fxcrt/bytestring \ + UnpackedTarball/pdfium/core/fxcrt/cfx_binarybuf \ + UnpackedTarball/pdfium/core/fxcrt/cfx_bitstream \ + UnpackedTarball/pdfium/core/fxcrt/cfx_utf8decoder \ + UnpackedTarball/pdfium/core/fxcrt/cfx_widetextbuf \ + UnpackedTarball/pdfium/core/fxcrt/fx_random \ + UnpackedTarball/pdfium/core/fxcrt/fx_string \ + UnpackedTarball/pdfium/core/fxcrt/widestring \ + UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssdata \ + UnpackedTarball/pdfium/core/fxcrt/fx_codepage \ + UnpackedTarball/pdfium/core/fxcrt/fx_number \ + UnpackedTarball/pdfium/core/fxcrt/cfx_utf8encoder \ + UnpackedTarball/pdfium/core/fxcrt/cfx_readonlymemorystream \ + UnpackedTarball/pdfium/core/fxcrt/observed_ptr \ + UnpackedTarball/pdfium/core/fxcrt/string_data_template \ +)) + +# fxge +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fxge/dib/cfx_bitmapcomposer \ + UnpackedTarball/pdfium/core/fxge/dib/cfx_bitmapstorer \ + UnpackedTarball/pdfium/core/fxge/dib/cfx_dibextractor \ + UnpackedTarball/pdfium/core/fxge/dib/cfx_dibitmap \ + UnpackedTarball/pdfium/core/fxge/cfx_drawutils \ + UnpackedTarball/pdfium/core/fxge/dib/cfx_imagerenderer \ + UnpackedTarball/pdfium/core/fxge/dib/cfx_imagestretcher \ + UnpackedTarball/pdfium/core/fxge/dib/cfx_imagetransformer \ + UnpackedTarball/pdfium/core/fxge/dib/cfx_scanlinecompositor \ + UnpackedTarball/pdfium/core/fxge/dib/cstretchengine \ + UnpackedTarball/pdfium/core/fxge/dib/fx_dib \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitDingbats \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitFixed \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitFixedBold \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitFixedItalic \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSans \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSansBold \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSansBoldItalic \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSansItalic \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSansMM \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSerif \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSerifBold \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSerifItalic \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSerifMM \ + UnpackedTarball/pdfium/core/fxge/fontdata/chromefontdata/FoxitSymbol \ + UnpackedTarball/pdfium/core/fxge/freetype/fx_freetype \ + UnpackedTarball/pdfium/core/fxge/renderdevicedriver_iface \ + UnpackedTarball/pdfium/core/fxge/agg/fx_agg_driver \ + UnpackedTarball/pdfium/core/fxge/cfx_cliprgn \ + UnpackedTarball/pdfium/core/fxge/cfx_color \ + UnpackedTarball/pdfium/core/fxge/cfx_glyphcache \ + UnpackedTarball/pdfium/core/fxge/cfx_folderfontinfo \ + UnpackedTarball/pdfium/core/fxge/cfx_font \ + UnpackedTarball/pdfium/core/fxge/cfx_fontcache \ + UnpackedTarball/pdfium/core/fxge/cfx_fontmapper \ + UnpackedTarball/pdfium/core/fxge/cfx_fontmgr \ + UnpackedTarball/pdfium/core/fxge/cfx_gemodule \ + UnpackedTarball/pdfium/core/fxge/cfx_graphstate \ + UnpackedTarball/pdfium/core/fxge/cfx_graphstatedata \ + UnpackedTarball/pdfium/core/fxge/cfx_pathdata \ + UnpackedTarball/pdfium/core/fxge/cfx_renderdevice \ + UnpackedTarball/pdfium/core/fxge/cfx_substfont \ + UnpackedTarball/pdfium/core/fxge/cfx_unicodeencoding \ + UnpackedTarball/pdfium/core/fxge/cfx_glyphbitmap \ + UnpackedTarball/pdfium/core/fxge/scoped_font_transform \ + UnpackedTarball/pdfium/core/fxge/text_glyph_pos \ + UnpackedTarball/pdfium/core/fxge/fx_font \ + UnpackedTarball/pdfium/core/fxge/dib/cfx_dibbase \ + UnpackedTarball/pdfium/core/fxge/dib/cfx_cmyk_to_srgb \ + UnpackedTarball/pdfium/core/fxge/text_char_pos \ + UnpackedTarball/pdfium/core/fxge/cfx_face \ +)) + +# javascript, build with pdf_enable_v8 disabled. +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/fxjs/cjs_event_context_stub \ + UnpackedTarball/pdfium/fxjs/cjs_runtimestub \ + UnpackedTarball/pdfium/fxjs/ijs_runtime \ +)) + +# pwl +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_appstream \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_button \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_caret \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_combo_box \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit_ctrl \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit_impl \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_icon \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_list_box \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_cbbutton \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_cblistbox \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_list_ctrl \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_scroll_bar \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_special_button \ + UnpackedTarball/pdfium/core/fxcrt/cfx_timer \ + UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_wnd \ +)) + +# third_party/bigint +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/third_party/bigint/BigInteger \ + UnpackedTarball/pdfium/third_party/bigint/BigIntegerUtils \ + UnpackedTarball/pdfium/third_party/bigint/BigUnsigned \ + UnpackedTarball/pdfium/third_party/bigint/BigUnsignedInABase \ +)) + +# third_party/fx_agg +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/third_party/agg23/agg_curves \ + UnpackedTarball/pdfium/third_party/agg23/agg_path_storage \ + UnpackedTarball/pdfium/third_party/agg23/agg_rasterizer_scanline_aa \ + UnpackedTarball/pdfium/third_party/agg23/agg_vcgen_dash \ + UnpackedTarball/pdfium/third_party/agg23/agg_vcgen_stroke \ +)) + +# third_party/fx_libopenjpeg +$(eval $(call gb_Library_add_generated_cobjects,pdfium,\ + UnpackedTarball/pdfium/third_party/libopenjpeg20/bio \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/cio \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/dwt \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/event \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/function_list \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/image \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/invert \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/j2k \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/jp2 \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/mct \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/mqc \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/openjpeg \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/opj_clock \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/pi \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/thread \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/t1 \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/t2 \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/tcd \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/tgt \ + UnpackedTarball/pdfium/third_party/libopenjpeg20/sparse_array \ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/third_party/libopenjpeg20/opj_malloc \ +)) + +# pdfium_base +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/address_space_randomization \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/page_allocator \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/spin_lock \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_alloc \ + UnpackedTarball/pdfium/third_party/base/debug/alias \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/oom_callback \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_bucket \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_oom \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_page \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_root_base \ + UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/random \ + UnpackedTarball/pdfium/third_party/base/memory/aligned_memory \ +)) + +# skia_shared +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/third_party/skia_shared/SkFloatToDecimal \ +)) + +$(eval $(call gb_Library_use_externals,pdfium,\ + libjpeg \ + lcms2 \ + zlib \ + icu_headers \ + icuuc \ +)) + +ifneq (,$(filter LINUX ANDROID,$(OS))) +$(eval $(call gb_Library_add_libs,pdfium,\ + -ldl \ + -lrt \ +)) + +$(eval $(call gb_Library_use_external,pdfium,freetype)) +$(eval $(call gb_Library_add_defs,pdfium,\ + -DDEFINE_PS_TABLES_DATA \ +)) + +else +$(eval $(call gb_Library_set_include,pdfium,\ + -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/freetype/include/ \ + -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/freetype/src/include/ \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,pdfium,\ + -DFT2_BUILD_LIBRARY \ + -DFT_CONFIG_MODULES_H='<freetype-custom-config/ftmodule.h>' \ + -DFT_CONFIG_OPTIONS_H='<freetype-custom-config/ftoption.h>' \ +)) + +# third_party/freetype +$(eval $(call gb_Library_add_generated_cobjects,pdfium,\ + UnpackedTarball/pdfium/third_party/freetype/src/src/base/ftbase \ + UnpackedTarball/pdfium/third_party/freetype/src/src/base/ftbitmap \ + UnpackedTarball/pdfium/third_party/freetype/src/src/base/ftglyph \ + UnpackedTarball/pdfium/third_party/freetype/src/src/base/ftinit \ + UnpackedTarball/pdfium/third_party/freetype/src/src/base/ftmm \ + UnpackedTarball/pdfium/third_party/freetype/src/src/base/ftsystem \ + UnpackedTarball/pdfium/third_party/freetype/src/src/cff/cff \ + UnpackedTarball/pdfium/third_party/freetype/src/src/cid/type1cid \ + UnpackedTarball/pdfium/third_party/freetype/src/src/psaux/psaux \ + UnpackedTarball/pdfium/third_party/freetype/src/src/pshinter/pshinter \ + UnpackedTarball/pdfium/third_party/freetype/src/src/psnames/psmodule \ + UnpackedTarball/pdfium/third_party/freetype/src/src/raster/raster \ + UnpackedTarball/pdfium/third_party/freetype/src/src/sfnt/sfnt \ + UnpackedTarball/pdfium/third_party/freetype/src/src/smooth/smooth \ + UnpackedTarball/pdfium/third_party/freetype/src/src/truetype/truetype \ + UnpackedTarball/pdfium/third_party/freetype/src/src/type1/type1 \ + UnpackedTarball/pdfium/third_party/freetype/src/src/base/ftdebug \ +)) +endif + +ifneq ($(OS),WNT) +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_posix \ +)) +endif + +ifeq ($(OS),WNT) +# fxge +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fxge/win32/cfx_psrenderer \ + UnpackedTarball/pdfium/core/fxge/win32/cpsoutput \ + UnpackedTarball/pdfium/core/fxge/win32/cgdi_device_driver \ + UnpackedTarball/pdfium/core/fxge/win32/cgdi_display_driver \ + UnpackedTarball/pdfium/core/fxge/win32/cgdi_plus_ext \ + UnpackedTarball/pdfium/core/fxge/win32/cgdi_printer_driver \ + UnpackedTarball/pdfium/core/fxge/win32/cps_printer_driver \ + UnpackedTarball/pdfium/core/fxge/win32/ctext_only_printer_driver \ + UnpackedTarball/pdfium/core/fxge/win32/cwin32_platform \ + UnpackedTarball/pdfium/core/fxge/cfx_windowsrenderdevice \ + UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_windows \ + UnpackedTarball/pdfium/third_party/base/win/win_util \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_windowsrenderdevice \ +)) + +$(eval $(call gb_Library_use_system_win32_libs,pdfium,\ + gdi32 \ +)) + +$(eval $(call gb_Library_add_defs,pdfium,\ + -DWIN32 \ +)) +endif + +ifeq ($(OS),MACOSX) +# fxge +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fxge/apple/fx_apple_platform \ + UnpackedTarball/pdfium/core/fxge/apple/fx_mac_impl \ + UnpackedTarball/pdfium/core/fxge/apple/fx_quartz_device \ +)) + +$(eval $(call gb_Library_use_system_darwin_frameworks,pdfium,\ + AppKit \ + CoreFoundation \ +)) +endif + +ifeq ($(OS),ANDROID) +# fxge +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fxge/android/cfpf_skiadevicemodule \ + UnpackedTarball/pdfium/core/fxge/android/cfpf_skiafont \ + UnpackedTarball/pdfium/core/fxge/android/cfpf_skiafontmgr \ + UnpackedTarball/pdfium/core/fxge/android/cfx_androidfontinfo \ + UnpackedTarball/pdfium/core/fxge/android/fx_android_impl \ + UnpackedTarball/pdfium/core/fxge/android/cfpf_skiapathfont \ +)) +endif + +ifeq ($(OS),LINUX) +# fxge +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fxge/fx_ge_linux \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/pdfium/Makefile b/external/pdfium/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/pdfium/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/pdfium/Module_pdfium.mk b/external/pdfium/Module_pdfium.mk new file mode 100644 index 000000000..3a52d5bd0 --- /dev/null +++ b/external/pdfium/Module_pdfium.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,pdfium)) + +$(eval $(call gb_Module_add_targets,pdfium,\ + Library_pdfium \ + UnpackedTarball_pdfium \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/pdfium/README b/external/pdfium/README new file mode 100644 index 000000000..c1719cf0a --- /dev/null +++ b/external/pdfium/README @@ -0,0 +1,13 @@ +External package containing pdfium. + +"Insert -> Picture -> From File..." uses this library when a PDF file is +selected. + +https://pdfium.googlesource.com/pdfium/ + +How to update the tarball: + +version=$(git for-each-ref|grep chromium/|tail -n 1|sed 's|.*/||') +git archive --prefix=pdfium/ --format=tar origin/chromium/${version} > pdfium-${version}.tar +(cd ..; tar --append --file pdfium/pdfium-${version}.tar pdfium/third_party/freetype/src/include/ pdfium/third_party/freetype/src/src/) +bzip2 pdfium-${version}.tar diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk new file mode 100644 index 000000000..f4643376c --- /dev/null +++ b/external/pdfium/UnpackedTarball_pdfium.mk @@ -0,0 +1,53 @@ +# -*- 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/. +# + +pdfium_patches := +pdfium_patches += ubsan.patch +# Fixes build on our baseline. +pdfium_patches += build.patch.1 +# Avoids Windows 8 build dependency. +pdfium_patches += windows7.patch.1 +pdfium_patches += c++20-comparison.patch + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium)) + +$(eval $(call gb_UnpackedTarball_set_tarball,pdfium,$(PDFIUM_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,pdfium,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,pdfium,\ + $(foreach patch,$(pdfium_patches),external/pdfium/$(patch)) \ +)) + +# Upstream build system generates this, but it's not really a generated file. +# Stripped down version from <https://dxr.mozilla.org/mozilla-central/source/ipc/chromium/src/build/build_config.h>. +$(eval $(call gb_UnpackedTarball_add_file,pdfium,build/build_config.h,external/pdfium/configs/build_config.h)) + +$(eval $(call gb_UnpackedTarball_set_post_action,pdfium,\ + mv third_party/bigint/BigInteger.cc third_party/bigint/BigInteger.cpp && \ + mv third_party/bigint/BigIntegerUtils.cc third_party/bigint/BigIntegerUtils.cpp && \ + mv third_party/bigint/BigUnsigned.cc third_party/bigint/BigUnsigned.cpp && \ + mv third_party/bigint/BigUnsignedInABase.cc third_party/bigint/BigUnsignedInABase.cpp && \ + mv third_party/base/allocator/partition_allocator/address_space_randomization.cc third_party/base/allocator/partition_allocator/address_space_randomization.cpp && \ + mv third_party/base/allocator/partition_allocator/page_allocator.cc third_party/base/allocator/partition_allocator/page_allocator.cpp && \ + mv third_party/base/allocator/partition_allocator/partition_alloc.cc third_party/base/allocator/partition_allocator/partition_alloc.cpp && \ + mv third_party/base/allocator/partition_allocator/spin_lock.cc third_party/base/allocator/partition_allocator/spin_lock.cpp && \ + mv third_party/base/debug/alias.cc third_party/base/debug/alias.cpp && \ + mv third_party/base/allocator/partition_allocator/oom_callback.cc third_party/base/allocator/partition_allocator/oom_callback.cpp && \ + mv third_party/base/allocator/partition_allocator/partition_bucket.cc third_party/base/allocator/partition_allocator/partition_bucket.cpp && \ + mv third_party/base/allocator/partition_allocator/partition_oom.cc third_party/base/allocator/partition_allocator/partition_oom.cpp && \ + mv third_party/base/allocator/partition_allocator/partition_page.cc third_party/base/allocator/partition_allocator/partition_page.cpp && \ + mv third_party/base/allocator/partition_allocator/partition_root_base.cc third_party/base/allocator/partition_allocator/partition_root_base.cpp && \ + mv third_party/base/allocator/partition_allocator/random.cc third_party/base/allocator/partition_allocator/random.cpp && \ + mv third_party/base/memory/aligned_memory.cc third_party/base/memory/aligned_memory.cpp && \ + mv third_party/base/win/win_util.cc third_party/base/win/win_util.cpp && \ + mv third_party/libopenjpeg20/opj_malloc.cc third_party/libopenjpeg20/opj_malloc.cpp \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1 new file mode 100644 index 000000000..9d48b022f --- /dev/null +++ b/external/pdfium/build.patch.1 @@ -0,0 +1,52 @@ +diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp +index 323de4ffc..f11a0b0ad 100644 +--- a/core/fpdfdoc/cpdf_metadata.cpp ++++ b/core/fpdfdoc/cpdf_metadata.cpp +@@ -74,7 +74,7 @@ std::vector<UnsupportedFeature> CPDF_Metadata::CheckForSharedForm() const { + CFX_XMLParser parser(stream); + std::unique_ptr<CFX_XMLDocument> doc = parser.Parse(); + if (!doc) +- return {}; ++ return std::vector<UnsupportedFeature>(); + + std::vector<UnsupportedFeature> unsupported; + CheckForSharedFormInternal(doc->GetRoot(), &unsupported); +diff --git a/third_party/base/span.h b/third_party/base/span.h +index 0fb627ba8..f71c362e2 100644 +--- a/third_party/base/span.h ++++ b/third_party/base/span.h +@@ -214,7 +214,7 @@ class span { + // Conversions from spans of compatible types: this allows a span<T> to be + // seamlessly used as a span<const T>, but not the other way around. + template <typename U, typename = internal::EnableIfLegalSpanConversion<U, T>> +- constexpr span(const span<U>& other) : span(other.data(), other.size()) {} ++ span(const span<U>& other) : span(other.data(), other.size()) {} + span& operator=(const span& other) noexcept = default; + ~span() noexcept { + if (!size_) { +diff --git a/third_party/base/span.h b/third_party/base/span.h +index 0fb627ba8..dda1fc8bc 100644 +--- a/third_party/base/span.h ++++ b/third_party/base/span.h +@@ -204,7 +204,7 @@ class span { + // size()|. + template <typename Container, + typename = internal::EnableIfSpanCompatibleContainer<Container, T>> +- constexpr span(Container& container) ++ span(Container& container) + : span(container.data(), container.size()) {} + template < + typename Container, +diff --git a/core/fxcodec/jpx/cjpx_decoder.cpp b/core/fxcodec/jpx/cjpx_decoder.cpp +index dbc1b1045..36b72461d 100644 +--- a/core/fxcodec/jpx/cjpx_decoder.cpp ++++ b/core/fxcodec/jpx/cjpx_decoder.cpp +@@ -70,7 +70,7 @@ Optional<OpjImageRgbData> alloc_rgb(size_t size) { + if (!data.b) + return {}; + +- return data; ++ return std::move(data); + } + + void sycc_to_rgb(int offset, diff --git a/external/pdfium/c++20-comparison.patch b/external/pdfium/c++20-comparison.patch new file mode 100644 index 000000000..025f9ba01 --- /dev/null +++ b/external/pdfium/c++20-comparison.patch @@ -0,0 +1,13 @@ +--- core/fxcrt/fx_memory_wrappers.h ++++ core/fxcrt/fx_memory_wrappers.h +@@ -70,8 +70,8 @@ + } + + // There's no state, so they are all the same, +- bool operator==(const FxAllocAllocator& that) { return true; } +- bool operator!=(const FxAllocAllocator& that) { return false; } ++ bool operator==(const FxAllocAllocator& that) const { return true; } ++ bool operator!=(const FxAllocAllocator& that) const { return false; } + }; + + #endif // CORE_FXCRT_FX_MEMORY_WRAPPERS_H_ diff --git a/external/pdfium/configs/build_config.h b/external/pdfium/configs/build_config.h new file mode 100644 index 000000000..ec93c2787 --- /dev/null +++ b/external/pdfium/configs/build_config.h @@ -0,0 +1,132 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// This file adds defines about the platform we're currently building on. +// Operating System: +// OS_WIN / OS_APPLE / OS_LINUX / OS_POSIX (MACOSX or LINUX) +// Compiler: +// COMPILER_MSVC / COMPILER_GCC +// Processor: +// ARCH_CPU_X86 / ARCH_CPU_X86_64 / ARCH_CPU_X86_FAMILY (X86 or X86_64) +// ARCH_CPU_32_BITS / ARCH_CPU_64_BITS + +#ifndef BUILD_BUILD_CONFIG_H_ +#define BUILD_BUILD_CONFIG_H_ + +// A set of macros to use for platform detection. +#if defined(ANDROID) +#define OS_ANDROID 1 +#define OS_LINUX 1 +#elif defined(__APPLE__) +#define OS_APPLE 1 +#elif defined(__linux__) +#define OS_LINUX 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#define OS_FREEBSD 1 +#elif defined(__NetBSD__) +#define OS_NETBSD 1 +#elif defined(__OpenBSD__) +#define OS_OPENBSD 1 +#elif defined(__sun__) +#define OS_SOLARIS 1 +#elif defined(_WIN32) +#define OS_WIN 1 +#else +#error Please add support for your platform in build/build_config.h +#endif + +// For access to standard BSD features, use OS_BSD instead of a +// more specific macro. +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(OS_OPENBSD) +#define OS_BSD 1 +#endif + +// For access to standard POSIX features, use OS_POSIX instead of a more +// specific macro. +#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS) +#define OS_POSIX 1 +#endif + +// Compiler detection. +#if defined(__GNUC__) +#define COMPILER_GCC 1 +#elif defined(_MSC_VER) +#define COMPILER_MSVC 1 +#else +#error Please add support for your compiler in build/build_config.h +#endif + +// Processor architecture detection. For more info on what's defined, see: +// http://msdn.microsoft.com/en-us/library/b0084kay.aspx +// http://www.agner.org/optimize/calling_conventions.pdf +// or with gcc, run: "echo | gcc -E -dM -" +#if defined(_M_X64) || defined(__x86_64__) +#define ARCH_CPU_X86_FAMILY 1 +#define ARCH_CPU_X86_64 1 +#define ARCH_CPU_64_BITS 1 +#elif defined(_M_IX86) || defined(__i386__) +#define ARCH_CPU_X86_FAMILY 1 +#define ARCH_CPU_X86 1 +#define ARCH_CPU_32_BITS 1 +#elif defined(__ARMEL__) +#define ARCH_CPU_ARM_FAMILY 1 +#define ARCH_CPU_ARMEL 1 +#define ARCH_CPU_32_BITS 1 +#define WCHAR_T_IS_UNSIGNED 1 +#elif defined(__powerpc64__) +#define ARCH_CPU_PPC64 1 +#define ARCH_CPU_64_BITS 1 +#elif defined(__ppc__) || defined(__powerpc__) +#define ARCH_CPU_PPC 1 +#define ARCH_CPU_32_BITS 1 +#elif defined(__sparc__) && defined(__arch64__) +#define ARCH_CPU_SPARC 1 +#define ARCH_CPU_64_BITS 1 +#elif defined(__sparc__) +#define ARCH_CPU_SPARC 1 +#define ARCH_CPU_32_BITS 1 +#elif defined(__mips64) && defined(__LP64__) +#define ARCH_CPU_MIPS 1 +#define ARCH_CPU_64_BITS 1 +#elif defined(__mips__) +#define ARCH_CPU_MIPS 1 +#define ARCH_CPU_32_BITS 1 +#elif defined(__hppa__) +#define ARCH_CPU_HPPA 1 +#define ARCH_CPU_32_BITS 1 +#elif defined(__ia64__) +#define ARCH_CPU_IA64 1 +#define ARCH_CPU_64_BITS 1 +#elif defined(__s390x__) +#define ARCH_CPU_S390X 1 +#define ARCH_CPU_64_BITS 1 +#elif defined(__s390__) +#define ARCH_CPU_S390 1 +#define ARCH_CPU_32_BITS 1 +#elif defined(__sh__) +#define ARCH_CPU_SH 1 +#define ARCH_CPU_32_BITS 1 +#elif defined(__alpha__) +#define ARCH_CPU_ALPHA 1 +#define ARCH_CPU_64_BITS 1 +#elif defined(__aarch64__) +#define ARCH_CPU_ARM_FAMILY 1 +#define ARCH_CPU_ARM64 1 +#define ARCH_CPU_64_BITS 1 +#else +#error Please add support for your architecture in build/build_config.h +#endif + +// Type detection for wchar_t. +#if defined(OS_WIN) +#define WCHAR_T_IS_UTF16 +#else +#define WCHAR_T_IS_UTF32 +#endif + +#endif // BUILD_BUILD_CONFIG_H_ diff --git a/external/pdfium/inc/pch/precompiled_pdfium.cxx b/external/pdfium/inc/pch/precompiled_pdfium.cxx new file mode 100644 index 000000000..063660fe2 --- /dev/null +++ b/external/pdfium/inc/pch/precompiled_pdfium.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_pdfium.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx b/external/pdfium/inc/pch/precompiled_pdfium.hxx new file mode 100644 index 000000000..2497306fa --- /dev/null +++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx @@ -0,0 +1,491 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2020-05-06 11:57:12 using: + ./bin/update_pch external/pdfium pdfium --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/pdfium/inc/pch/precompiled_pdfium.hxx "make external/pdfium.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <agg_curves.h> +#include <agg_math.h> +#include <agg_path_storage.h> +#include <agg_rasterizer_scanline_aa.h> +#include <agg_shorten_path.h> +#include <agg_vcgen_dash.h> +#include <agg_vcgen_stroke.h> +#include <algorithm> +#include <array> +#include <atomic> +#include <cassert> +#include <cctype> +#include <cfloat> +#include <climits> +#include <cmath> +#include <cstring> +#include <cwchar> +#include <cwctype> +#include <functional> +#include <iterator> +#include <limits.h> +#include <limits> +#include <list> +#include <map> +#include <memory> +#include <numeric> +#include <set> +#include <setjmp.h> +#include <sstream> +#include <stack> +#include <stddef.h> +#include <stdlib.h> +#include <string.h> +#include <string> +#include <time.h> +#include <tuple> +#include <type_traits> +#include <utility> +#include <vector> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <build/build_config.h> +#include <constants/access_permissions.h> +#include <constants/annotation_common.h> +#include <constants/annotation_flags.h> +#include <constants/form_fields.h> +#include <constants/form_flags.h> +#include <constants/page_object.h> +#include <constants/stream_dict_common.h> +#include <constants/transparency.h> +#include <core/fdrm/fx_crypt.h> +#include <core/fpdfapi/cmaps/CNS1/cmaps_cns1.h> +#include <core/fpdfapi/cmaps/GB1/cmaps_gb1.h> +#include <core/fpdfapi/cmaps/Japan1/cmaps_japan1.h> +#include <core/fpdfapi/cmaps/Korea1/cmaps_korea1.h> +#include <core/fpdfapi/cmaps/fpdf_cmaps.h> +#include <core/fpdfapi/edit/cpdf_contentstream_write_utils.h> +#include <core/fpdfapi/edit/cpdf_creator.h> +#include <core/fpdfapi/edit/cpdf_pagecontentgenerator.h> +#include <core/fpdfapi/edit/cpdf_pagecontentmanager.h> +#include <core/fpdfapi/edit/cpdf_stringarchivestream.h> +#include <core/fpdfapi/font/cfx_cttgsubtable.h> +#include <core/fpdfapi/font/cfx_stockfontarray.h> +#include <core/fpdfapi/font/cpdf_cid2unicodemap.h> +#include <core/fpdfapi/font/cpdf_cidfont.h> +#include <core/fpdfapi/font/cpdf_cmap.h> +#include <core/fpdfapi/font/cpdf_cmapmanager.h> +#include <core/fpdfapi/font/cpdf_cmapparser.h> +#include <core/fpdfapi/font/cpdf_font.h> +#include <core/fpdfapi/font/cpdf_fontencoding.h> +#include <core/fpdfapi/font/cpdf_fontglobals.h> +#include <core/fpdfapi/font/cpdf_simplefont.h> +#include <core/fpdfapi/font/cpdf_tounicodemap.h> +#include <core/fpdfapi/font/cpdf_truetypefont.h> +#include <core/fpdfapi/font/cpdf_type1font.h> +#include <core/fpdfapi/font/cpdf_type3char.h> +#include <core/fpdfapi/font/cpdf_type3font.h> +#include <core/fpdfapi/page/cpdf_allstates.h> +#include <core/fpdfapi/page/cpdf_annotcontext.h> +#include <core/fpdfapi/page/cpdf_clippath.h> +#include <core/fpdfapi/page/cpdf_color.h> +#include <core/fpdfapi/page/cpdf_colorspace.h> +#include <core/fpdfapi/page/cpdf_colorstate.h> +#include <core/fpdfapi/page/cpdf_contentmarkitem.h> +#include <core/fpdfapi/page/cpdf_contentmarks.h> +#include <core/fpdfapi/page/cpdf_contentparser.h> +#include <core/fpdfapi/page/cpdf_devicecs.h> +#include <core/fpdfapi/page/cpdf_dib.h> +#include <core/fpdfapi/page/cpdf_docpagedata.h> +#include <core/fpdfapi/page/cpdf_expintfunc.h> +#include <core/fpdfapi/page/cpdf_form.h> +#include <core/fpdfapi/page/cpdf_formobject.h> +#include <core/fpdfapi/page/cpdf_function.h> +#include <core/fpdfapi/page/cpdf_generalstate.h> +#include <core/fpdfapi/page/cpdf_graphicstates.h> +#include <core/fpdfapi/page/cpdf_iccprofile.h> +#include <core/fpdfapi/page/cpdf_image.h> +#include <core/fpdfapi/page/cpdf_imageobject.h> +#include <core/fpdfapi/page/cpdf_meshstream.h> +#include <core/fpdfapi/page/cpdf_occontext.h> +#include <core/fpdfapi/page/cpdf_page.h> +#include <core/fpdfapi/page/cpdf_pagemodule.h> +#include <core/fpdfapi/page/cpdf_pageobject.h> +#include <core/fpdfapi/page/cpdf_pageobjectholder.h> +#include <core/fpdfapi/page/cpdf_path.h> +#include <core/fpdfapi/page/cpdf_pathobject.h> +#include <core/fpdfapi/page/cpdf_pattern.h> +#include <core/fpdfapi/page/cpdf_patterncs.h> +#include <core/fpdfapi/page/cpdf_psengine.h> +#include <core/fpdfapi/page/cpdf_psfunc.h> +#include <core/fpdfapi/page/cpdf_sampledfunc.h> +#include <core/fpdfapi/page/cpdf_shadingobject.h> +#include <core/fpdfapi/page/cpdf_shadingpattern.h> +#include <core/fpdfapi/page/cpdf_stitchfunc.h> +#include <core/fpdfapi/page/cpdf_streamcontentparser.h> +#include <core/fpdfapi/page/cpdf_streamparser.h> +#include <core/fpdfapi/page/cpdf_textobject.h> +#include <core/fpdfapi/page/cpdf_textstate.h> +#include <core/fpdfapi/page/cpdf_tilingpattern.h> +#include <core/fpdfapi/page/cpdf_transferfunc.h> +#include <core/fpdfapi/page/cpdf_transferfuncdib.h> +#include <core/fpdfapi/page/cpdf_transparency.h> +#include <core/fpdfapi/parser/cfdf_document.h> +#include <core/fpdfapi/parser/cpdf_array.h> +#include <core/fpdfapi/parser/cpdf_boolean.h> +#include <core/fpdfapi/parser/cpdf_cross_ref_avail.h> +#include <core/fpdfapi/parser/cpdf_cross_ref_table.h> +#include <core/fpdfapi/parser/cpdf_crypto_handler.h> +#include <core/fpdfapi/parser/cpdf_data_avail.h> +#include <core/fpdfapi/parser/cpdf_dictionary.h> +#include <core/fpdfapi/parser/cpdf_document.h> +#include <core/fpdfapi/parser/cpdf_encryptor.h> +#include <core/fpdfapi/parser/cpdf_flateencoder.h> +#include <core/fpdfapi/parser/cpdf_hint_tables.h> +#include <core/fpdfapi/parser/cpdf_indirect_object_holder.h> +#include <core/fpdfapi/parser/cpdf_linearized_header.h> +#include <core/fpdfapi/parser/cpdf_name.h> +#include <core/fpdfapi/parser/cpdf_null.h> +#include <core/fpdfapi/parser/cpdf_number.h> +#include <core/fpdfapi/parser/cpdf_object.h> +#include <core/fpdfapi/parser/cpdf_object_avail.h> +#include <core/fpdfapi/parser/cpdf_object_stream.h> +#include <core/fpdfapi/parser/cpdf_object_walker.h> +#include <core/fpdfapi/parser/cpdf_page_object_avail.h> +#include <core/fpdfapi/parser/cpdf_parser.h> +#include <core/fpdfapi/parser/cpdf_read_validator.h> +#include <core/fpdfapi/parser/cpdf_reference.h> +#include <core/fpdfapi/parser/cpdf_security_handler.h> +#include <core/fpdfapi/parser/cpdf_simple_parser.h> +#include <core/fpdfapi/parser/cpdf_stream.h> +#include <core/fpdfapi/parser/cpdf_stream_acc.h> +#include <core/fpdfapi/parser/cpdf_string.h> +#include <core/fpdfapi/parser/cpdf_syntax_parser.h> +#include <core/fpdfapi/parser/fpdf_parser_decode.h> +#include <core/fpdfapi/parser/fpdf_parser_utility.h> +#include <core/fpdfapi/render/charposlist.h> +#include <core/fpdfapi/render/cpdf_devicebuffer.h> +#include <core/fpdfapi/render/cpdf_docrenderdata.h> +#include <core/fpdfapi/render/cpdf_imagecacheentry.h> +#include <core/fpdfapi/render/cpdf_imageloader.h> +#include <core/fpdfapi/render/cpdf_imagerenderer.h> +#include <core/fpdfapi/render/cpdf_pagerendercache.h> +#include <core/fpdfapi/render/cpdf_pagerendercontext.h> +#include <core/fpdfapi/render/cpdf_progressiverenderer.h> +#include <core/fpdfapi/render/cpdf_rendercontext.h> +#include <core/fpdfapi/render/cpdf_renderoptions.h> +#include <core/fpdfapi/render/cpdf_rendershading.h> +#include <core/fpdfapi/render/cpdf_renderstatus.h> +#include <core/fpdfapi/render/cpdf_rendertiling.h> +#include <core/fpdfapi/render/cpdf_scaledrenderbuffer.h> +#include <core/fpdfapi/render/cpdf_textrenderer.h> +#include <core/fpdfapi/render/cpdf_type3cache.h> +#include <core/fpdfapi/render/cpdf_type3glyphmap.h> +#include <core/fpdfdoc/cba_fontmap.h> +#include <core/fpdfdoc/cline.h> +#include <core/fpdfdoc/cpdf_aaction.h> +#include <core/fpdfdoc/cpdf_action.h> +#include <core/fpdfdoc/cpdf_annot.h> +#include <core/fpdfdoc/cpdf_annotlist.h> +#include <core/fpdfdoc/cpdf_apsettings.h> +#include <core/fpdfdoc/cpdf_bookmark.h> +#include <core/fpdfdoc/cpdf_bookmarktree.h> +#include <core/fpdfdoc/cpdf_color_utils.h> +#include <core/fpdfdoc/cpdf_defaultappearance.h> +#include <core/fpdfdoc/cpdf_dest.h> +#include <core/fpdfdoc/cpdf_filespec.h> +#include <core/fpdfdoc/cpdf_formcontrol.h> +#include <core/fpdfdoc/cpdf_formfield.h> +#include <core/fpdfdoc/cpdf_icon.h> +#include <core/fpdfdoc/cpdf_iconfit.h> +#include <core/fpdfdoc/cpdf_interactiveform.h> +#include <core/fpdfdoc/cpdf_link.h> +#include <core/fpdfdoc/cpdf_linklist.h> +#include <core/fpdfdoc/cpdf_metadata.h> +#include <core/fpdfdoc/cpdf_nametree.h> +#include <core/fpdfdoc/cpdf_numbertree.h> +#include <core/fpdfdoc/cpdf_pagelabel.h> +#include <core/fpdfdoc/cpdf_structelement.h> +#include <core/fpdfdoc/cpdf_structtree.h> +#include <core/fpdfdoc/cpdf_variabletext.h> +#include <core/fpdfdoc/cpdf_viewerpreferences.h> +#include <core/fpdfdoc/cpvt_fontmap.h> +#include <core/fpdfdoc/cpvt_generateap.h> +#include <core/fpdfdoc/cpvt_word.h> +#include <core/fpdfdoc/cpvt_wordinfo.h> +#include <core/fpdfdoc/csection.h> +#include <core/fpdfdoc/ctypeset.h> +#include <core/fpdfdoc/ipvt_fontmap.h> +#include <core/fpdftext/cpdf_linkextract.h> +#include <core/fpdftext/cpdf_textpage.h> +#include <core/fpdftext/cpdf_textpagefind.h> +#include <core/fpdftext/unicodenormalizationdata.h> +#include <core/fxcodec/basic/basicmodule.h> +#include <core/fxcodec/cfx_codec_memory.h> +#include <core/fxcodec/fax/faxmodule.h> +#include <core/fxcodec/flate/flatemodule.h> +#include <core/fxcodec/fx_codec.h> +#include <core/fxcodec/gif/cfx_gif.h> +#include <core/fxcodec/gif/cfx_lzwdecompressor.h> +#include <core/fxcodec/icc/iccmodule.h> +#include <core/fxcodec/jbig2/JBig2_ArithDecoder.h> +#include <core/fxcodec/jbig2/JBig2_ArithIntDecoder.h> +#include <core/fxcodec/jbig2/JBig2_BitStream.h> +#include <core/fxcodec/jbig2/JBig2_Context.h> +#include <core/fxcodec/jbig2/JBig2_Define.h> +#include <core/fxcodec/jbig2/JBig2_DocumentContext.h> +#include <core/fxcodec/jbig2/JBig2_GrdProc.h> +#include <core/fxcodec/jbig2/JBig2_GrrdProc.h> +#include <core/fxcodec/jbig2/JBig2_HtrdProc.h> +#include <core/fxcodec/jbig2/JBig2_HuffmanDecoder.h> +#include <core/fxcodec/jbig2/JBig2_HuffmanTable.h> +#include <core/fxcodec/jbig2/JBig2_Image.h> +#include <core/fxcodec/jbig2/JBig2_PatternDict.h> +#include <core/fxcodec/jbig2/JBig2_PddProc.h> +#include <core/fxcodec/jbig2/JBig2_SddProc.h> +#include <core/fxcodec/jbig2/JBig2_Segment.h> +#include <core/fxcodec/jbig2/JBig2_SymbolDict.h> +#include <core/fxcodec/jbig2/JBig2_TrdProc.h> +#include <core/fxcodec/jbig2/jbig2_decoder.h> +#include <core/fxcodec/jpeg/jpeg_common.h> +#include <core/fxcodec/jpeg/jpegmodule.h> +#include <core/fxcodec/jpx/cjpx_decoder.h> +#include <core/fxcodec/jpx/jpx_decode_utils.h> +#include <core/fxcodec/scanlinedecoder.h> +#include <core/fxcrt/autorestorer.h> +#include <core/fxcrt/bytestring.h> +#include <core/fxcrt/cfx_binarybuf.h> +#include <core/fxcrt/cfx_bitstream.h> +#include <core/fxcrt/cfx_datetime.h> +#include <core/fxcrt/cfx_fixedbufgrow.h> +#include <core/fxcrt/cfx_memorystream.h> +#include <core/fxcrt/cfx_readonlymemorystream.h> +#include <core/fxcrt/cfx_seekablestreamproxy.h> +#include <core/fxcrt/cfx_timer.h> +#include <core/fxcrt/cfx_utf8decoder.h> +#include <core/fxcrt/cfx_utf8encoder.h> +#include <core/fxcrt/cfx_widetextbuf.h> +#include <core/fxcrt/css/cfx_css.h> +#include <core/fxcrt/css/cfx_csscolorvalue.h> +#include <core/fxcrt/css/cfx_csscomputedstyle.h> +#include <core/fxcrt/css/cfx_csscustomproperty.h> +#include <core/fxcrt/css/cfx_cssdata.h> +#include <core/fxcrt/css/cfx_cssdeclaration.h> +#include <core/fxcrt/css/cfx_cssenumvalue.h> +#include <core/fxcrt/css/cfx_cssexttextbuf.h> +#include <core/fxcrt/css/cfx_cssnumbervalue.h> +#include <core/fxcrt/css/cfx_csspropertyholder.h> +#include <core/fxcrt/css/cfx_cssrulecollection.h> +#include <core/fxcrt/css/cfx_cssselector.h> +#include <core/fxcrt/css/cfx_cssstringvalue.h> +#include <core/fxcrt/css/cfx_cssstylerule.h> +#include <core/fxcrt/css/cfx_cssstyleselector.h> +#include <core/fxcrt/css/cfx_cssstylesheet.h> +#include <core/fxcrt/css/cfx_csssyntaxparser.h> +#include <core/fxcrt/css/cfx_csstextbuf.h> +#include <core/fxcrt/css/cfx_cssvalue.h> +#include <core/fxcrt/css/cfx_cssvaluelist.h> +#include <core/fxcrt/css/cfx_cssvaluelistparser.h> +#include <core/fxcrt/fileaccess_iface.h> +#include <core/fxcrt/fx_bidi.h> +#include <core/fxcrt/fx_codepage.h> +#include <core/fxcrt/fx_coordinates.h> +#include <core/fxcrt/fx_extension.h> +#include <core/fxcrt/fx_memory.h> +#include <core/fxcrt/fx_memory_wrappers.h> +#include <core/fxcrt/fx_number.h> +#include <core/fxcrt/fx_random.h> +#include <core/fxcrt/fx_safe_types.h> +#include <core/fxcrt/fx_stream.h> +#include <core/fxcrt/fx_string.h> +#include <core/fxcrt/fx_system.h> +#include <core/fxcrt/fx_unicode.h> +#include <core/fxcrt/maybe_owned.h> +#include <core/fxcrt/observed_ptr.h> +#include <core/fxcrt/pauseindicator_iface.h> +#include <core/fxcrt/retain_ptr.h> +#include <core/fxcrt/string_data_template.h> +#include <core/fxcrt/string_pool_template.h> +#include <core/fxcrt/unowned_ptr.h> +#include <core/fxcrt/widestring.h> +#include <core/fxcrt/xml/cfx_xmlchardata.h> +#include <core/fxcrt/xml/cfx_xmldocument.h> +#include <core/fxcrt/xml/cfx_xmlelement.h> +#include <core/fxcrt/xml/cfx_xmlinstruction.h> +#include <core/fxcrt/xml/cfx_xmlnode.h> +#include <core/fxcrt/xml/cfx_xmlparser.h> +#include <core/fxcrt/xml/cfx_xmltext.h> +#include <core/fxge/agg/fx_agg_driver.h> +#include <core/fxge/cfx_cliprgn.h> +#include <core/fxge/cfx_color.h> +#include <core/fxge/cfx_defaultrenderdevice.h> +#include <core/fxge/cfx_drawutils.h> +#include <core/fxge/cfx_face.h> +#include <core/fxge/cfx_fillrenderoptions.h> +#include <core/fxge/cfx_folderfontinfo.h> +#include <core/fxge/cfx_font.h> +#include <core/fxge/cfx_fontcache.h> +#include <core/fxge/cfx_fontmapper.h> +#include <core/fxge/cfx_fontmgr.h> +#include <core/fxge/cfx_gemodule.h> +#include <core/fxge/cfx_glyphbitmap.h> +#include <core/fxge/cfx_glyphcache.h> +#include <core/fxge/cfx_graphstate.h> +#include <core/fxge/cfx_graphstatedata.h> +#include <core/fxge/cfx_pathdata.h> +#include <core/fxge/cfx_renderdevice.h> +#include <core/fxge/cfx_substfont.h> +#include <core/fxge/cfx_textrenderoptions.h> +#include <core/fxge/cfx_unicodeencoding.h> +#include <core/fxge/dib/cfx_bitmapcomposer.h> +#include <core/fxge/dib/cfx_bitmapstorer.h> +#include <core/fxge/dib/cfx_cmyk_to_srgb.h> +#include <core/fxge/dib/cfx_dibbase.h> +#include <core/fxge/dib/cfx_dibextractor.h> +#include <core/fxge/dib/cfx_dibitmap.h> +#include <core/fxge/dib/cfx_imagerenderer.h> +#include <core/fxge/dib/cfx_imagestretcher.h> +#include <core/fxge/dib/cfx_imagetransformer.h> +#include <core/fxge/dib/cfx_scanlinecompositor.h> +#include <core/fxge/dib/cstretchengine.h> +#include <core/fxge/dib/fx_dib.h> +#include <core/fxge/dib/scanlinecomposer_iface.h> +#include <core/fxge/fontdata/chromefontdata/chromefontdata.h> +#include <core/fxge/fx_font.h> +#include <core/fxge/fx_freetype.h> +#include <core/fxge/render_defines.h> +#include <core/fxge/renderdevicedriver_iface.h> +#include <core/fxge/scoped_font_transform.h> +#include <core/fxge/systemfontinfo_iface.h> +#include <core/fxge/text_char_pos.h> +#include <core/fxge/text_glyph_pos.h> +#include <fpdfsdk/cpdfsdk_actionhandler.h> +#include <fpdfsdk/cpdfsdk_annot.h> +#include <fpdfsdk/cpdfsdk_annothandlermgr.h> +#include <fpdfsdk/cpdfsdk_annotiteration.h> +#include <fpdfsdk/cpdfsdk_annotiterator.h> +#include <fpdfsdk/cpdfsdk_appstream.h> +#include <fpdfsdk/cpdfsdk_baannot.h> +#include <fpdfsdk/cpdfsdk_baannothandler.h> +#include <fpdfsdk/cpdfsdk_customaccess.h> +#include <fpdfsdk/cpdfsdk_fieldaction.h> +#include <fpdfsdk/cpdfsdk_filewriteadapter.h> +#include <fpdfsdk/cpdfsdk_formfillenvironment.h> +#include <fpdfsdk/cpdfsdk_helpers.h> +#include <fpdfsdk/cpdfsdk_interactiveform.h> +#include <fpdfsdk/cpdfsdk_pageview.h> +#include <fpdfsdk/cpdfsdk_pauseadapter.h> +#include <fpdfsdk/cpdfsdk_renderpage.h> +#include <fpdfsdk/cpdfsdk_widget.h> +#include <fpdfsdk/cpdfsdk_widgethandler.h> +#include <fpdfsdk/formfiller/cffl_button.h> +#include <fpdfsdk/formfiller/cffl_checkbox.h> +#include <fpdfsdk/formfiller/cffl_combobox.h> +#include <fpdfsdk/formfiller/cffl_formfiller.h> +#include <fpdfsdk/formfiller/cffl_interactiveformfiller.h> +#include <fpdfsdk/formfiller/cffl_listbox.h> +#include <fpdfsdk/formfiller/cffl_privatedata.h> +#include <fpdfsdk/formfiller/cffl_pushbutton.h> +#include <fpdfsdk/formfiller/cffl_radiobutton.h> +#include <fpdfsdk/formfiller/cffl_textfield.h> +#include <fpdfsdk/formfiller/cffl_textobject.h> +#include <fpdfsdk/ipdfsdk_annothandler.h> +#include <fpdfsdk/pwl/cpwl_button.h> +#include <fpdfsdk/pwl/cpwl_caret.h> +#include <fpdfsdk/pwl/cpwl_cbbutton.h> +#include <fpdfsdk/pwl/cpwl_cblistbox.h> +#include <fpdfsdk/pwl/cpwl_combo_box.h> +#include <fpdfsdk/pwl/cpwl_edit.h> +#include <fpdfsdk/pwl/cpwl_edit_ctrl.h> +#include <fpdfsdk/pwl/cpwl_edit_impl.h> +#include <fpdfsdk/pwl/cpwl_icon.h> +#include <fpdfsdk/pwl/cpwl_list_box.h> +#include <fpdfsdk/pwl/cpwl_list_ctrl.h> +#include <fpdfsdk/pwl/cpwl_scroll_bar.h> +#include <fpdfsdk/pwl/cpwl_special_button.h> +#include <fpdfsdk/pwl/cpwl_wnd.h> +#include <fpdfsdk/pwl/ipwl_fillernotify.h> +#include <fpdfsdk/pwl/ipwl_systemhandler.h> +#include <fxjs/cjs_event_context_stub.h> +#include <fxjs/cjs_runtimestub.h> +#include <fxjs/ijs_event_context.h> +#include <fxjs/ijs_runtime.h> +#include <public/fpdf_annot.h> +#include <public/fpdf_attachment.h> +#include <public/fpdf_catalog.h> +#include <public/fpdf_dataavail.h> +#include <public/fpdf_doc.h> +#include <public/fpdf_edit.h> +#include <public/fpdf_ext.h> +#include <public/fpdf_flatten.h> +#include <public/fpdf_formfill.h> +#include <public/fpdf_fwlevent.h> +#include <public/fpdf_progressive.h> +#include <public/fpdf_save.h> +#include <public/fpdf_searchex.h> +#include <public/fpdf_signature.h> +#include <public/fpdf_structtree.h> +#include <public/fpdf_sysfontinfo.h> +#include <public/fpdf_text.h> +#include <public/fpdf_transformpage.h> +#include <public/fpdfview.h> +#include <third_party/agg23/agg_clip_liang_barsky.h> +#include <third_party/agg23/agg_conv_dash.h> +#include <third_party/agg23/agg_conv_stroke.h> +#include <third_party/agg23/agg_curves.h> +#include <third_party/agg23/agg_path_storage.h> +#include <third_party/agg23/agg_pixfmt_gray.h> +#include <third_party/agg23/agg_rasterizer_scanline_aa.h> +#include <third_party/agg23/agg_renderer_scanline.h> +#include <third_party/agg23/agg_scanline_u.h> +#include <third_party/base/allocator/partition_allocator/address_space_randomization.h> +#include <third_party/base/allocator/partition_allocator/oom.h> +#include <third_party/base/allocator/partition_allocator/oom_callback.h> +#include <third_party/base/allocator/partition_allocator/page_allocator.h> +#include <third_party/base/allocator/partition_allocator/page_allocator_internal.h> +#include <third_party/base/allocator/partition_allocator/partition_alloc.h> +#include <third_party/base/allocator/partition_allocator/partition_alloc_check.h> +#include <third_party/base/allocator/partition_allocator/partition_alloc_constants.h> +#include <third_party/base/allocator/partition_allocator/partition_bucket.h> +#include <third_party/base/allocator/partition_allocator/partition_direct_map_extent.h> +#include <third_party/base/allocator/partition_allocator/partition_oom.h> +#include <third_party/base/allocator/partition_allocator/partition_page.h> +#include <third_party/base/allocator/partition_allocator/partition_root_base.h> +#include <third_party/base/allocator/partition_allocator/random.h> +#include <third_party/base/allocator/partition_allocator/spin_lock.h> +#include <third_party/base/bits.h> +#include <third_party/base/check.h> +#include <third_party/base/check_op.h> +#include <third_party/base/compiler_specific.h> +#include <third_party/base/containers/adapters.h> +#include <third_party/base/debug/alias.h> +#include <third_party/base/memory/aligned_memory.h> +#include <third_party/base/no_destructor.h> +#include <third_party/base/notreached.h> +#include <third_party/base/numerics/safe_conversions.h> +#include <third_party/base/numerics/safe_math.h> +#include <third_party/base/optional.h> +#include <third_party/base/ptr_util.h> +#include <third_party/base/span.h> +#include <third_party/base/stl_util.h> +#include <third_party/skia_shared/SkFloatToDecimal.h> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/pdfium/ubsan.patch b/external/pdfium/ubsan.patch new file mode 100644 index 000000000..8610e24f2 --- /dev/null +++ b/external/pdfium/ubsan.patch @@ -0,0 +1,24 @@ +--- core/fxcrt/string_data_template.cpp ++++ core/fxcrt/string_data_template.cpp +@@ -82,7 +82,8 @@ void StringDataTemplate<CharType>::CopyContentsAt(size_t offset, + ASSERT(nLen >= 0); + ASSERT(offset + nLen <= m_nAllocLength); + +- memcpy(m_String + offset, pStr, nLen * sizeof(CharType)); ++ if (nLen != 0) ++ memcpy(m_String + offset, pStr, nLen * sizeof(CharType)); + m_String[offset + nLen] = 0; + } + +--- core/fxge/cfx_glyphcache.cpp ++++ core/fxge/cfx_glyphcache.cpp +@@ -183,7 +183,8 @@ std::unique_ptr<CFX_GlyphBitmap> CFX_GlyphCache::RenderGlyph( + } + } + } else { +- memset(pDestBuf, 0, dest_pitch * bmheight); ++ if (dest_pitch != 0 && bmheight != 0) ++ memset(pDestBuf, 0, dest_pitch * bmheight); + int rowbytes = std::min(abs(src_pitch), dest_pitch); + for (int row = 0; row < bmheight; row++) + memcpy(pDestBuf + row * dest_pitch, pSrcBuf + row * src_pitch, rowbytes); diff --git a/external/pdfium/windows7.patch.1 b/external/pdfium/windows7.patch.1 new file mode 100644 index 000000000..d33f273ff --- /dev/null +++ b/external/pdfium/windows7.patch.1 @@ -0,0 +1,34 @@ +diff --git a/third_party/base/win/win_util.cc b/third_party/base/win/win_util.cc +index ae2dba84d..7a3718848 100644 +--- a/third_party/base/win/win_util.cc ++++ b/third_party/base/win/win_util.cc +@@ -12,28 +12,7 @@ namespace base { + namespace win { + + bool IsUser32AndGdi32Available() { +- static auto is_user32_and_gdi32_available = []() { +- // If win32k syscalls aren't disabled, then user32 and gdi32 are available. +- +- typedef decltype( +- GetProcessMitigationPolicy)* GetProcessMitigationPolicyType; +- GetProcessMitigationPolicyType get_process_mitigation_policy_func = +- reinterpret_cast<GetProcessMitigationPolicyType>(GetProcAddress( +- GetModuleHandle(L"kernel32.dll"), "GetProcessMitigationPolicy")); +- +- if (!get_process_mitigation_policy_func) +- return true; +- +- PROCESS_MITIGATION_SYSTEM_CALL_DISABLE_POLICY policy = {}; +- if (get_process_mitigation_policy_func(GetCurrentProcess(), +- ProcessSystemCallDisablePolicy, +- &policy, sizeof(policy))) { +- return policy.DisallowWin32kSystemCalls == 0; +- } +- +- return true; +- }(); +- return is_user32_and_gdi32_available; ++ return true; + } + + } // namespace win diff --git a/external/poppler/Makefile b/external/poppler/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/poppler/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/poppler/Module_poppler.mk b/external/poppler/Module_poppler.mk new file mode 100644 index 000000000..ebae6e7aa --- /dev/null +++ b/external/poppler/Module_poppler.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,poppler)) + +$(eval $(call gb_Module_add_targets,poppler,\ + StaticLibrary_poppler \ + UnpackedTarball_poppler \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/poppler/README b/external/poppler/README new file mode 100644 index 000000000..35a640264 --- /dev/null +++ b/external/poppler/README @@ -0,0 +1 @@ +From [http://poppler.freedesktop.org/]. Not modified. PDF rendering library based on the xpdf-3.0 code base. diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk new file mode 100644 index 000000000..8bf9f528e --- /dev/null +++ b/external/poppler/StaticLibrary_poppler.mk @@ -0,0 +1,123 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*- +# +# 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_StaticLibrary_StaticLibrary,poppler)) + +$(eval $(call gb_StaticLibrary_use_unpacked,poppler,poppler)) + +$(eval $(call gb_StaticLibrary_use_external,poppler,libjpeg)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,poppler)) + +$(eval $(call gb_StaticLibrary_set_include,poppler,\ + -I$(WORKDIR)/UnpackedTarball/poppler \ + -I$(WORKDIR)/UnpackedTarball/poppler/fofi \ + -I$(WORKDIR)/UnpackedTarball/poppler/goo \ + -I$(WORKDIR)/UnpackedTarball/poppler/poppler \ + $$(INCLUDE) \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_StaticLibrary_add_defs,poppler,\ + -DWIN32_LEAN_AND_MEAN \ + -D_CRT_SECURE_NO_WARNINGS \ +)) +$(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\ + /Zc:wchar_t- \ +)) +endif + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,poppler,cc)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ + UnpackedTarball/poppler/goo/gfile \ + UnpackedTarball/poppler/goo/GooTimer \ + UnpackedTarball/poppler/goo/GooString \ + UnpackedTarball/poppler/goo/NetPBMWriter \ + UnpackedTarball/poppler/goo/PNGWriter \ + UnpackedTarball/poppler/goo/TiffWriter \ + UnpackedTarball/poppler/goo/JpegWriter \ + UnpackedTarball/poppler/goo/ImgWriter \ + UnpackedTarball/poppler/goo/gstrtod \ + UnpackedTarball/poppler/goo/grandom \ + UnpackedTarball/poppler/goo/glibc \ + UnpackedTarball/poppler/goo/glibc_strtok_r \ + UnpackedTarball/poppler/fofi/FoFiBase \ + UnpackedTarball/poppler/fofi/FoFiEncodings \ + UnpackedTarball/poppler/fofi/FoFiTrueType \ + UnpackedTarball/poppler/fofi/FoFiType1 \ + UnpackedTarball/poppler/fofi/FoFiType1C \ + UnpackedTarball/poppler/fofi/FoFiIdentifier \ + UnpackedTarball/poppler/poppler/Annot \ + UnpackedTarball/poppler/poppler/Array \ + UnpackedTarball/poppler/poppler/BuiltinFont \ + UnpackedTarball/poppler/poppler/BuiltinFontTables \ + UnpackedTarball/poppler/poppler/CachedFile \ + UnpackedTarball/poppler/poppler/Catalog \ + UnpackedTarball/poppler/poppler/CertificateInfo \ + UnpackedTarball/poppler/poppler/CharCodeToUnicode \ + UnpackedTarball/poppler/poppler/CMap \ + UnpackedTarball/poppler/poppler/DateInfo \ + UnpackedTarball/poppler/poppler/Decrypt \ + UnpackedTarball/poppler/poppler/Dict \ + UnpackedTarball/poppler/poppler/Error \ + UnpackedTarball/poppler/poppler/FileSpec \ + UnpackedTarball/poppler/poppler/FontEncodingTables \ + UnpackedTarball/poppler/poppler/Form \ + UnpackedTarball/poppler/poppler/FontInfo \ + UnpackedTarball/poppler/poppler/Function \ + UnpackedTarball/poppler/poppler/Gfx \ + UnpackedTarball/poppler/poppler/GfxFont \ + UnpackedTarball/poppler/poppler/GfxState \ + UnpackedTarball/poppler/poppler/GlobalParams \ + UnpackedTarball/poppler/poppler/Hints \ + UnpackedTarball/poppler/poppler/JArithmeticDecoder \ + UnpackedTarball/poppler/poppler/JBIG2Stream \ + UnpackedTarball/poppler/poppler/Lexer \ + UnpackedTarball/poppler/poppler/Link \ + UnpackedTarball/poppler/poppler/Linearization \ + UnpackedTarball/poppler/poppler/LocalPDFDocBuilder \ + UnpackedTarball/poppler/poppler/MarkedContentOutputDev \ + UnpackedTarball/poppler/poppler/NameToCharCode \ + UnpackedTarball/poppler/poppler/Object \ + UnpackedTarball/poppler/poppler/OptionalContent \ + UnpackedTarball/poppler/poppler/Outline \ + UnpackedTarball/poppler/poppler/OutputDev \ + UnpackedTarball/poppler/poppler/Page \ + UnpackedTarball/poppler/poppler/PageTransition \ + UnpackedTarball/poppler/poppler/Parser \ + UnpackedTarball/poppler/poppler/PDFDoc \ + UnpackedTarball/poppler/poppler/PDFDocEncoding \ + UnpackedTarball/poppler/poppler/PDFDocFactory \ + UnpackedTarball/poppler/poppler/ProfileData \ + UnpackedTarball/poppler/poppler/PreScanOutputDev \ + UnpackedTarball/poppler/poppler/PSTokenizer \ + UnpackedTarball/poppler/poppler/SignatureInfo \ + UnpackedTarball/poppler/poppler/Stream \ + UnpackedTarball/poppler/poppler/StructTreeRoot \ + UnpackedTarball/poppler/poppler/StructElement \ + UnpackedTarball/poppler/poppler/UnicodeMap \ + UnpackedTarball/poppler/poppler/UnicodeMapFuncs \ + UnpackedTarball/poppler/poppler/UnicodeTypeTable \ + UnpackedTarball/poppler/poppler/UTF \ + UnpackedTarball/poppler/poppler/XRef \ + UnpackedTarball/poppler/poppler/PSOutputDev \ + UnpackedTarball/poppler/poppler/TextOutputDev \ + UnpackedTarball/poppler/poppler/PageLabelInfo \ + UnpackedTarball/poppler/poppler/SecurityHandler \ + UnpackedTarball/poppler/poppler/StdinCachedFile \ + UnpackedTarball/poppler/poppler/StdinPDFDocBuilder \ + UnpackedTarball/poppler/poppler/Sound \ + UnpackedTarball/poppler/poppler/ViewerPreferences \ + UnpackedTarball/poppler/poppler/Movie \ + UnpackedTarball/poppler/poppler/Rendition \ + UnpackedTarball/poppler/poppler/DCTStream \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk new file mode 100644 index 000000000..68fd06d94 --- /dev/null +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -0,0 +1,18 @@ +# -*- 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,poppler)) + +$(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler)) + +$(eval $(call gb_UnpackedTarball_add_patches,poppler,\ + external/poppler/poppler-config.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 new file mode 100644 index 000000000..cb74cd66f --- /dev/null +++ b/external/poppler/poppler-config.patch.1 @@ -0,0 +1,489 @@ +*three* poppler config headers + +mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none -DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off + +manually disabled these because cmake failed to do it: +HAVE_CAIRO +ENABLE_NSS3 +ENABLE_LIBPNG (twice!) +ENABLE_LIBTIFF (twice!) +ENABLE_LIBCURL + +diff --git a/config.h b/config.h +new file mode 100644 +index 0fbd336a..451213f8 100644 +--- /dev/null ++++ b/config.h +@@ -0,0 +1,248 @@ ++/* config.h. Generated from config.h.cmake by cmake. */ ++ ++/* Build against libcurl. */ ++/* #undef ENABLE_LIBCURL */ ++ ++/* Use libjpeg instead of builtin jpeg decoder. */ ++#define ENABLE_LIBJPEG 1 ++ ++/* Use libopenjpeg instead of builtin jpeg2000 decoder. */ ++/* #undef ENABLE_LIBOPENJPEG */ ++ ++/* Build against libtiff. */ ++/* #define ENABLE_LIBTIFF 1 */ ++ ++/* Build against libpng. */ ++/* #define ENABLE_LIBPNG 1 */ ++ ++/* Do not hardcode the library location */ ++/* #undef ENABLE_RELOCATABLE */ ++ ++/* Build against zlib. */ ++/* #undef ENABLE_ZLIB */ ++ ++/* Use zlib instead of builtin zlib decoder to uncompress flate streams. */ ++/* #undef ENABLE_ZLIB_UNCOMPRESS */ ++ ++/* Build against libnss3 for digital signature validation */ ++/* #define ENABLE_NSS3 1 */ ++ ++/* Use cairo for rendering. */ ++/* #define HAVE_CAIRO 1 */ ++ ++/* Do we have any DCT decoder?. */ ++#define HAVE_DCT_DECODER 1 ++ ++/* Do we have any JPX decoder?. */ ++/* #undef HAVE_JPX_DECODER */ ++ ++#if !defined(_WIN32) ++/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. ++ */ ++#define HAVE_DIRENT_H 1 ++#endif ++ ++#if !defined(_WIN32) ++/* Define to 1 if you have the <dlfcn.h> header file. */ ++#define HAVE_DLFCN_H 1 ++#endif ++ ++/* Define to 1 if you have the <fcntl.h> header file. */ ++#define HAVE_FCNTL_H 1 ++ ++/* Define to 1 if you have the `fseek64' function. */ ++/* #undef HAVE_FSEEK64 */ ++ ++#if !defined(_WIN32) ++/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ ++#define HAVE_FSEEKO 1 ++#endif ++ ++/* Define to 1 if you have the `ftell64' function. */ ++/* #undef HAVE_FTELL64 */ ++ ++#if !defined(__APPLE__) && !defined(_WIN32) ++/* Define to 1 if you have the `pread64' function. */ ++#define HAVE_PREAD64 1 ++#endif ++ ++#if !defined(__APPLE__) && !defined(_WIN32) ++/* Define to 1 if you have the `lseek64' function. */ ++#define HAVE_LSEEK64 1 ++#endif ++ ++#if !defined(_WIN32) ++/* Defines if gettimeofday is available on your system */ ++#define HAVE_GETTIMEOFDAY 1 ++#endif ++ ++#if !defined(_WIN32) ++/* Defines if gmtime_r is available on your system */ ++#define HAVE_GMTIME_R 1 ++#endif ++ ++#if !defined(_WIN32) ++/* Defines if timegm is available on your system */ ++#define HAVE_TIMEGM 1 ++#endif ++ ++/* Define if you have the iconv() function and it works. */ ++/* #undef HAVE_ICONV */ ++ ++/* Define to 1 if you have the `z' library (-lz). */ ++/* #undef HAVE_LIBZ */ ++ ++#if !defined(_WIN32) ++/* Defines if localtime_r is available on your system */ ++#define HAVE_LOCALTIME_R 1 ++#endif ++ ++#if !defined(_WIN32) ++/* Define to 1 if you have the `mkstemp' function. */ ++#define HAVE_MKSTEMP 1 ++#endif ++ ++#if !defined(_WIN32) ++/* Define to 1 if you have the `rand_r' function. */ ++#define HAVE_RAND_R 1 ++#endif ++ ++#if defined(_WIN32) ++/* Define to 1 if you have the `strcpy_s' function. */ ++#define HAVE_STRCPY_S 1 ++#endif ++ ++#if defined(_WIN32) ++/* Define to 1 if you have the `strcat_s' function. */ ++#define HAVE_STRCAT_S 1 ++#endif ++ ++#if !defined(_WIN32) ++/* Defines if strtok_r is available on your system */ ++#define HAVE_STRTOK_R 1 ++#endif ++ ++/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ ++/* #undef HAVE_NDIR_H */ ++ ++#if !defined(_WIN32) ++/* Define to 1 if you have the `popen' function. */ ++#define HAVE_POPEN 1 ++#endif ++ ++/* Use splash for rendering. */ ++/* #undef HAVE_SPLASH */ ++ ++#if !defined(__APPLE__) && !defined(_WIN32) ++/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. ++ */ ++#define HAVE_SYS_DIR_H 1 ++#endif ++ ++#if !defined(__APPLE__) && !defined(_WIN32) ++/* Define to 1 if you have the <sys/mman.h> header file. */ ++#define HAVE_SYS_MMAN_H 1 ++#endif ++ ++/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. ++ */ ++/* #undef HAVE_SYS_NDIR_H */ ++ ++/* Define to 1 if you have the <sys/stat.h> header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++#if !defined(_WIN32) ++/* Define to 1 if you have the <unistd.h> header file. */ ++#define HAVE_UNISTD_H 1 ++#endif ++ ++/* Define to 1 if you have a big endian machine */ ++/* #undef WORDS_BIGENDIAN */ ++ ++/* Define as const if the declaration of iconv() needs const. */ ++#define ICONV_CONST ++ ++/* Enable multithreading support. */ ++#define MULTITHREADED 1 ++ ++/* Generate OPI comments in PS output. */ ++#define OPI_SUPPORT 1 ++ ++/* Name of package */ ++#define PACKAGE "poppler" ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=poppler" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "poppler" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "poppler 0.82.0" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "poppler" ++ ++/* Define to the home page for this package. */ ++#define PACKAGE_URL "" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "0.82.0" ++ ++/* Poppler data dir */ ++#define POPPLER_DATADIR "/usr/local/share/poppler" ++ ++/* Support for curl based doc builder is compiled in. */ ++/* #undef POPPLER_HAS_CURL_SUPPORT */ ++ ++/* Include support for CMYK rasterization */ ++/* #undef SPLASH_CMYK */ ++ ++/* Enable word list support. */ ++#define TEXTOUT_WORD_LIST 1 ++ ++/* Defines if use cms */ ++/* #undef USE_CMS */ ++ ++/* Use fixed point arithmetic in the Splash backend */ ++/* #undef USE_FIXEDPOINT */ ++ ++/* Use single precision arithmetic in the Splash backend */ ++/* #undef USE_FLOAT */ ++ ++/* Version number of package */ ++#define VERSION "0.82.0" ++ ++#if defined(__APPLE__) ++#elif defined (_WIN32) ++/* Use win32 font configuration backend */ ++#define WITH_FONTCONFIGURATION_WIN32 1 ++#else ++/* Use fontconfig font configuration backend */ ++#define WITH_FONTCONFIGURATION_FONTCONFIG 1 ++#endif ++ ++/* OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag */ ++/* #undef WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG */ ++ ++/* MS defined snprintf as deprecated but then added it in Visual Studio 2015. */ ++#if defined(_MSC_VER) && _MSC_VER < 1900 ++#define snprintf _snprintf ++#endif ++ ++//------------------------------------------------------------------------ ++// popen ++//------------------------------------------------------------------------ ++#if defined(_MSC_VER) || defined(__BORLANDC__) ++#define popen _popen ++#define pclose _pclose ++#endif ++ ++/* Number of bits in a file offset, on hosts where this is settable. */ ++/* #undef _FILE_OFFSET_BITS */ ++ ++/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ ++/* TODO This is wrong, port if needed #undef _LARGEFILE_SOURCE */ ++ ++/* Define for large files, on AIX-style hosts. */ ++/* TODO This is wrong, port if needed #undef _LARGE_FILES */ +diff --git a/poppler/poppler-config.h b/poppler/poppler-config.h +new file mode 100644 +index 0fbd336a..451213f8 100644 +--- /dev/null ++++ b/poppler/poppler-config.h +@@ -0,0 +1,173 @@ ++//================================================= -*- mode: c++ -*- ==== ++// ++// poppler-config.h ++// ++// Copyright 1996-2011 Glyph & Cog, LLC ++// ++//======================================================================== ++ ++//======================================================================== ++// ++// Modified under the Poppler project - http://poppler.freedesktop.org ++// ++// All changes made under the Poppler project to this file are licensed ++// under GPL version 2 or later ++// ++// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com> ++// Copyright (C) 2014 Hib Eris <hib@hiberis.nl> ++// Copyright (C) 2016 Tor Lillqvist <tml@collabora.com> ++// Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> ++// ++// To see a description of the changes please see the Changelog file that ++// came with your tarball or type make ChangeLog if you are building from git ++// ++//======================================================================== ++ ++#ifndef POPPLER_CONFIG_H ++#define POPPLER_CONFIG_H ++ ++// We duplicate some of the config.h #define's here since they are ++// used in some of the header files we install. The #ifndef/#endif ++// around #undef look odd, but it's to silence warnings about ++// redefining those symbols. ++ ++/* Defines the poppler version. */ ++#ifndef POPPLER_VERSION ++#define POPPLER_VERSION "0.82.0" ++#endif ++ ++/* Enable multithreading support. */ ++#ifndef MULTITHREADED ++#define MULTITHREADED 1 ++#endif ++ ++/* Use fixedpoint. */ ++#ifndef USE_FIXEDPOINT ++/* #undef USE_FIXEDPOINT */ ++#endif ++ ++/* Use single precision arithmetic in the Splash backend */ ++#ifndef USE_FLOAT ++/* #undef USE_FLOAT */ ++#endif ++ ++/* Include support for OPI comments. */ ++#ifndef OPI_SUPPORT ++#define OPI_SUPPORT 1 ++#endif ++ ++/* Enable word list support. */ ++#ifndef TEXTOUT_WORD_LIST ++#define TEXTOUT_WORD_LIST 1 ++#endif ++ ++/* Support for curl is compiled in. */ ++#ifndef POPPLER_HAS_CURL_SUPPORT ++/* #undef POPPLER_HAS_CURL_SUPPORT */ ++#endif ++ ++/* Use libjpeg instead of builtin jpeg decoder. */ ++#ifndef ENABLE_LIBJPEG ++#define ENABLE_LIBJPEG 1 ++#endif ++ ++/* Build against libtiff. */ ++#ifndef ENABLE_LIBTIFF ++/* #define ENABLE_LIBTIFF 1 */ ++#endif ++ ++/* Build against libpng. */ ++#ifndef ENABLE_LIBPNG ++/* #define ENABLE_LIBPNG 1 */ ++#endif ++ ++/* Use zlib instead of builtin zlib decoder. */ ++#ifndef ENABLE_ZLIB ++/* #undef ENABLE_ZLIB */ ++#endif ++ ++/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. ++ */ ++#ifndef HAVE_DIRENT_H ++#if !defined(_WIN32) ++#define HAVE_DIRENT_H 1 ++#endif ++#endif ++ ++/* Defines if gettimeofday is available on your system */ ++#ifndef HAVE_GETTIMEOFDAY ++#if !defined(_WIN32) ++#define HAVE_GETTIMEOFDAY 1 ++#endif ++#endif ++ ++/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ ++#ifndef HAVE_NDIR_H ++/* #undef HAVE_NDIR_H */ ++#endif ++ ++/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. ++ */ ++#ifndef HAVE_SYS_DIR_H ++#if !defined(__APPLE__) && !defined(_WIN32) ++#define HAVE_SYS_DIR_H 1 ++#endif ++#endif ++ ++/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. ++ */ ++#ifndef HAVE_SYS_NDIR_H ++/* #undef HAVE_SYS_NDIR_H */ ++#endif ++ ++/* Defines if use cms */ ++#ifndef USE_CMS ++/* #undef USE_CMS */ ++#endif ++ ++/* Use header-only classes from Boost in the Splash backend */ ++#ifndef USE_BOOST_HEADERS ++/* #undef USE_BOOST_HEADERS */ ++#endif ++ ++// Also, there are preprocessor symbols in the header files ++// that are used but never defined when building poppler using configure ++// or cmake: DISABLE_OUTLINE, DEBUG_MEM, ++// ENABLE_PLUGINS, DEBUG_FORMS ++ ++//------------------------------------------------------------------------ ++// version ++//------------------------------------------------------------------------ ++ ++// copyright notice ++#define popplerCopyright "Copyright 2005-2018 The Poppler Developers - http://poppler.freedesktop.org" ++#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" ++ ++//------------------------------------------------------------------------ ++// Win32 stuff ++//------------------------------------------------------------------------ ++ ++#if defined(_WIN32) && !defined(_MSC_VER) ++#include <windef.h> ++#else ++#define CDECL ++#endif ++ ++//------------------------------------------------------------------------ ++// Compiler ++//------------------------------------------------------------------------ ++ ++#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) ++#include <stdio.h> // __MINGW_PRINTF_FORMAT is defined in the mingw stdio.h ++#ifdef __MINGW_PRINTF_FORMAT ++#define GCC_PRINTF_FORMAT(fmt_index, va_index) \ ++ __attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index))) ++#else ++#define GCC_PRINTF_FORMAT(fmt_index, va_index) \ ++ __attribute__((__format__(__printf__, fmt_index, va_index))) ++#endif ++#else ++#define GCC_PRINTF_FORMAT(fmt_index, va_index) ++#endif ++ ++#endif /* POPPLER_CONFIG_H */ +diff --git a/cpp/poppler-version.h b/cpp/poppler-version.h +new file mode 100644 +index 0fbd336a..451213f8 100644 +--- /dev/null ++++ b/cpp/poppler-version.h +@@ -0,0 +1,39 @@ ++/* ++ * Copyright (C) 2009, Pino Toscano <pino@kde.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#ifndef POPPLER_VERSION_H ++#define POPPLER_VERSION_H ++ ++#include "poppler-global.h" ++ ++#define POPPLER_VERSION "0.82.0" ++#define POPPLER_VERSION_MAJOR 0 ++#define POPPLER_VERSION_MINOR 82 ++#define POPPLER_VERSION_MICRO 0 ++ ++namespace poppler ++{ ++ ++POPPLER_CPP_EXPORT std::string version_string(); ++POPPLER_CPP_EXPORT unsigned int version_major(); ++POPPLER_CPP_EXPORT unsigned int version_minor(); ++POPPLER_CPP_EXPORT unsigned int version_micro(); ++ ++} ++ ++#endif diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk new file mode 100644 index 000000000..c437bb29a --- /dev/null +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -0,0 +1,80 @@ +# -*- 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,postgresql)) + +$(eval $(call gb_ExternalProject_use_externals,postgresql,\ + $(if $(ENABLE_LDAP),openldap) \ + openssl \ + zlib \ +)) + +$(eval $(call gb_ExternalProject_register_targets,postgresql,\ + build \ +)) + +ifeq ($(OS),WNT) + +$(eval $(call gb_ExternalProject_use_nmake,postgresql,build)) + +$(call gb_ExternalProject_get_state_target,postgresql,build) : + $(call gb_Trace_StartRange,postgresql,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \ + ,src) + $(call gb_Trace_EndRange,postgresql,EXTERNAL) + +else + +postgresql_CPPFLAGS := $(ZLIB_CFLAGS) +postgresql_LDFLAGS := $(LDFLAGS) + +ifeq ($(SYSTEM_ZLIB),) +postgresql_LDFLAGS += $(ZLIB_LIBS) +endif + +ifeq ($(DISABLE_OPENSSL),) +ifeq ($(SYSTEM_OPENSSL),) +postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include +postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)/ +endif +endif + +ifeq ($(SYSTEM_OPENLDAP),) +postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openldap)/include +postgresql_LDFLAGS += \ + -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs \ + -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs \ + -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs \ + $(if $(SYSTEM_NSS),,\ + -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib) \ + +endif + + +$(call gb_ExternalProject_get_state_target,postgresql,build) : + $(call gb_Trace_StartRange,postgresql,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + ./configure \ + --without-readline --disable-shared --with-ldap \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(DISABLE_OPENSSL),,--with-openssl \ + $(if $(WITH_KRB5), --with-krb5) \ + $(if $(WITH_GSSAPI),--with-gssapi)) \ + $(if $(ENABLE_LDAP),,--with-ldap=no) \ + CPPFLAGS="$(postgresql_CPPFLAGS)" \ + LDFLAGS="$(postgresql_LDFLAGS)" \ + $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \ + && cd src/interfaces/libpq \ + && MAKEFLAGS= && $(MAKE) all-static-lib) + $(call gb_Trace_EndRange,postgresql,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/postgresql/Makefile b/external/postgresql/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/postgresql/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/postgresql/Module_postgresql.mk b/external/postgresql/Module_postgresql.mk new file mode 100644 index 000000000..1f655c6e5 --- /dev/null +++ b/external/postgresql/Module_postgresql.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,postgresql)) + +$(eval $(call gb_Module_add_targets,postgresql,\ + ExternalProject_postgresql \ + UnpackedTarball_postgresql \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/postgresql/README b/external/postgresql/README new file mode 100644 index 000000000..edc3d5df2 --- /dev/null +++ b/external/postgresql/README @@ -0,0 +1,3 @@ +PostgreSQL object-relational database management system + +We use some pieces of this code for the postgresql database connector.
\ No newline at end of file diff --git a/external/postgresql/UnpackedTarball_postgresql.mk b/external/postgresql/UnpackedTarball_postgresql.mk new file mode 100644 index 000000000..a53bbbffd --- /dev/null +++ b/external/postgresql/UnpackedTarball_postgresql.mk @@ -0,0 +1,31 @@ +# -*- 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,postgresql)) + +$(eval $(call gb_UnpackedTarball_set_tarball,postgresql,$(POSTGRESQL_TARBALL),,postgresql)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,postgresql,3)) + +$(eval $(call gb_UnpackedTarball_add_patches,postgresql, \ + external/postgresql/postgresql-libs-leak.patch \ + external/postgresql/postgresql-9.2.1-libreoffice.patch \ + external/postgresql/windows.patch.0 \ + external/postgresql/postgresql.exit.patch.0 \ +)) + +ifeq ($(SYSTEM_ZLIB),) +$(eval $(call gb_UnpackedTarball_add_patches,postgresql, \ + external/postgresql/internal-zlib.patch.1 \ +)) +endif + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,postgresql)) + +# vim: set noet sw=4 ts=4: diff --git a/external/postgresql/internal-zlib.patch.1 b/external/postgresql/internal-zlib.patch.1 new file mode 100644 index 000000000..ac2b728e1 --- /dev/null +++ b/external/postgresql/internal-zlib.patch.1 @@ -0,0 +1,29 @@ +diff -up postgresql/configure.dt postgresql/configure +--- postgresql/configure.dt 2016-11-03 17:34:17.282388226 +0100 ++++ postgresql/configure 2016-11-03 17:34:35.004202484 +0100 +@@ -8566,13 +8566,13 @@ fi + + if test "$with_zlib" = yes; then + +-{ $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5 +-$as_echo_n "checking for inflate in -lz... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking for inflate in -lzlib" >&5 ++$as_echo_n "checking for inflate in -lzlib... " >&6; } + if test "${ac_cv_lib_z_inflate+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $LIBS" ++LIBS="-lzlib $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8636,7 +8636,7 @@ if test "x$ac_cv_lib_z_inflate" = x""yes + #define HAVE_LIBZ 1 + _ACEOF + +- LIBS="-lz $LIBS" ++ LIBS="-lzlib $LIBS" + + else + { { $as_echo "$as_me:$LINENO: error: zlib library not found diff --git a/external/postgresql/postgresql-9.2.1-libreoffice.patch b/external/postgresql/postgresql-9.2.1-libreoffice.patch new file mode 100644 index 000000000..174ee8551 --- /dev/null +++ b/external/postgresql/postgresql-9.2.1-libreoffice.patch @@ -0,0 +1,74 @@ +--- misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile 2011-09-22 23:57:57.000000000 +0200 ++++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/Makefile 2011-12-15 09:02:18.000000000 +0100 +@@ -148,3 +148,6 @@ + maintainer-clean: distclean maintainer-clean-lib + $(MAKE) -C test $@ + rm -f libpq-dist.rc ++ ++libpq-flags.mk: ++ @printf '%s\n' 'LIBPQ_DEP_LIBS+=$(SHLIB_LINK)' > '$@' +--- misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-14 14:28:59.000000000 +0100 ++++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak 2011-12-15 09:11:37.000000000 +0100 +@@ -11,14 +11,12 @@ + !ENDIF + + !IFDEF DEBUG +-OPT=/Od /Zi /MDd ++OPT=/Od /Zi + LOPT=/DEBUG +-DEBUGDEF=/D _DEBUG +-OUTFILENAME=libpqd ++OUTFILENAME=libpq + !ELSE + OPT=/O2 /MD + LOPT= +-DEBUGDEF=/D NDEBUG + OUTFILENAME=libpq + !ENDIF + +@@ -67,18 +66,11 @@ + CPP=cl.exe + RSC=rc.exe + +-!IFDEF DEBUG +-OUTDIR=.\Debug +-INTDIR=.\Debug +-CPP_OBJS=.\Debug/ +-!ELSE +-OUTDIR=.\Release +-INTDIR=.\Release +-CPP_OBJS=.\Release/ +-!ENDIF +- ++OUTDIR=. ++INTDIR=. ++CPP_OBJS=./ + +-ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll" ++ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" + + CLEAN : + -@erase "$(INTDIR)\getaddrinfo.obj" +@@ -178,10 +170,11 @@ + "$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +-CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. /I "$(SSL_INC)" \ ++CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. $(SOLARINC) /I $(WORKDIR)/UnpackedTarball/openssl/include \ + /D "FRONTEND" $(DEBUGDEF) \ + /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" \ + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \ ++ /D "_CRT_NONSTDC_NO_DEPRECATE" \ + /D "_CRT_SECURE_NO_DEPRECATE" $(ADD_DEFINES) + + !IFDEF USE_SSL +@@ -222,7 +215,7 @@ + << + + "$(INTDIR)\libpq.res" : "$(INTDIR)" libpq-dist.rc +- $(RSC) $(RSC_PROJ) libpq-dist.rc ++ $(RSC) $(SOLARINC) $(RSC_PROJ) libpq-dist.rc + + + "$(OUTDIR)\$(OUTFILENAME).dll" : "$(OUTDIR)" "$(INTDIR)\libpq.res" + diff --git a/external/postgresql/postgresql-libs-leak.patch b/external/postgresql/postgresql-libs-leak.patch new file mode 100644 index 000000000..8224137f1 --- /dev/null +++ b/external/postgresql/postgresql-libs-leak.patch @@ -0,0 +1,40 @@ +diff --recursive -u misc/build/postgresql-9.1.1/configure.in misc/build/postgresql-9.1.1.patched/configure.in +--- misc/build/postgresql-9.1.1/configure.in 2011-09-22 23:57:57.000000000 +0200 ++++ misc/build/postgresql-9.1.1.patched/configure.in 2012-02-03 11:42:45.000000000 +0100 +@@ -903,18 +903,9 @@ + *** Not using spinlocks will cause poor performance.]) + fi + +-if test "$with_gssapi" = yes ; then +- if test "$PORTNAME" != "win32"; then +- AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [], +- [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])]) +- else +- LIBS="$LIBS -lgssapi32" +- fi +-fi +- + if test "$with_krb5" = yes ; then + if test "$PORTNAME" != "win32"; then +- AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err 'com_err -lssl -lcrypto'], [], ++ AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], + [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) + AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [], + [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])]) +@@ -924,6 +915,15 @@ + fi + fi + ++if test "$with_gssapi" = yes ; then ++ if test "$PORTNAME" != "win32"; then ++ AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [], ++ [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])]) ++ else ++ LIBS="$LIBS -lgssapi32" ++ fi ++fi ++ + if test "$with_openssl" = yes ; then + dnl Order matters! + if test "$PORTNAME" != "win32"; then + diff --git a/external/postgresql/postgresql.exit.patch.0 b/external/postgresql/postgresql.exit.patch.0 new file mode 100644 index 000000000..0d167925f --- /dev/null +++ b/external/postgresql/postgresql.exit.patch.0 @@ -0,0 +1,19 @@ +# error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration] +--- configure ++++ configure +@@ -24565,6 +24565,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include <stdlib.h> + typedef long int ac_int64; + + /* +@@ -24702,6 +24702,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include <stdlib.h> + typedef long long int ac_int64; + + /* diff --git a/external/postgresql/windows.patch.0 b/external/postgresql/windows.patch.0 new file mode 100644 index 000000000..dbac548d4 --- /dev/null +++ b/external/postgresql/windows.patch.0 @@ -0,0 +1,11 @@ +--- src/port/chklocale.c ++++ src/port/chklocale.c +@@ -211,7 +211,7 @@ + { + r = malloc(16); /* excess */ + if (r != NULL) +- sprintf(r, "CP%u", loct->locinfo->lc_codepage); ++ sprintf(r, "CP%u", ((struct __crt_locale_data_public *) loct->locinfo)->_locale_lc_codepage); + _free_locale(loct); + } + #else diff --git a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 b/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 new file mode 100644 index 000000000..489e5d0e8 --- /dev/null +++ b/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 @@ -0,0 +1,59 @@ +From 582d188e6e3487180891f1fc457a80dec8be26a8 Mon Sep 17 00:00:00 2001 +From: Christian Heimes <christian@python.org> +Date: Mon, 24 Sep 2018 14:38:31 +0200 +Subject: [PATCH] [3.6] bpo-17239: Disable external entities in SAX parser + (GH-9217) (GH-9512) + +The SAX parser no longer processes general external entities by default +to increase security. Before, the parser created network connections +to fetch remote files or loaded local files from the file system for DTD +and entities. + +Signed-off-by: Christian Heimes <christian@python.org> + +https://bugs.python.org/issue17239. +(cherry picked from commit 17b1d5d4e36aa57a9b25a0e694affbd1ee637e45) + +Co-authored-by: Christian Heimes <christian@python.org> + + + +https://bugs.python.org/issue17239 +--- + Doc/library/xml.dom.pulldom.rst | 14 +++++ + Doc/library/xml.rst | 6 +- + Doc/library/xml.sax.rst | 8 +++ + Doc/whatsnew/3.6.rst | 18 +++++- + Lib/test/test_pulldom.py | 7 +++ + Lib/test/test_sax.py | 60 ++++++++++++++++++- + Lib/test/test_xml_etree.py | 13 ++++ + Lib/xml/sax/expatreader.py | 2 +- + .../2018-09-11-18-30-55.bpo-17239.kOpwK2.rst | 3 + + 9 files changed, 125 insertions(+), 6 deletions(-) + create mode 100644 Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst + +diff --git a/Lib/xml/sax/expatreader.py b/Lib/xml/sax/expatreader.py +index 421358fa5b..5066ffc2fa 100644 +--- a/Lib/xml/sax/expatreader.py ++++ b/Lib/xml/sax/expatreader.py +@@ -95,7 +95,7 @@ class ExpatParser(xmlreader.IncrementalParser, xmlreader.Locator): + self._lex_handler_prop = None + self._parsing = 0 + self._entity_stack = [] +- self._external_ges = 1 ++ self._external_ges = 0 + self._interning = None + + # XMLReader methods +diff --git a/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst b/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst +new file mode 100644 +index 0000000000..8dd0fe8c1b +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst +@@ -0,0 +1,3 @@ ++The xml.sax and xml.dom.minidom parsers no longer processes external ++entities by default. External DTD and ENTITY declarations no longer ++load files or create network connections. +-- +2.20.1 + diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk new file mode 100644 index 000000000..4dfc3b196 --- /dev/null +++ b/external/python3/ExternalPackage_python3.mk @@ -0,0 +1,867 @@ +# -*- 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_ExternalPackage_ExternalPackage,python3,python3)) + +$(eval $(call gb_ExternalPackage_use_external_project,python3,python3)) + +ifeq ($(OS),WNT) +ifeq ($(CPUNAME),X86_64) +python_arch_subdir=amd64/ +else +python_arch_subdir=win32/ +endif +$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe,PCbuild/$(python_arch_subdir)python$(if $(MSVC_USE_DEBUG_RUNTIME),_d).exe)) +$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll)) +ifeq ($(MSVC_USE_DEBUG_RUNTIME),) +$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR).dll,PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll)) +endif +$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\ + PCbuild/$(python_arch_subdir)_asyncio$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_ctypes$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_ctypes_test$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_decimal$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_elementtree$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_msi$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_multiprocessing$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_queue$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_socket$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_ssl$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_testbuffer$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_testcapi$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)_testconsole$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)pyexpat$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)select$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)unicodedata$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ + PCbuild/$(python_arch_subdir)winsound$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ +)) +else +$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python.bin,python)) +$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).so,libpython$(PYTHON_VERSION_MAJOR).so)) +$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so.1.0,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so)) +$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so.1.0-gdb.py,Tools/gdb/libpython.py)) + +# Unfortunately the python build system does not allow to explicitly enable or +# disable these, it just tries to build them and then prints which did not +# build successfully without stopping; so the build will break on delivering if +# one of these failed to build. +# Obviously this list should not contain stuff with external dependencies +# that may not be available on baseline systems. + +ifneq ($(OS),AIX) +$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\ + LO_lib/array.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_asyncio.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/audioop.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/binascii.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_bisect.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_blake2.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/cmath.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_codecs_cn.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_codecs_hk.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_codecs_iso2022.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_codecs_jp.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_codecs_kr.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_codecs_tw.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_contextvars.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_crypt.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_csv.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_ctypes.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_ctypes_test.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_datetime.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_decimal.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_elementtree.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/fcntl.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/grp.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + $(if $(DISABLE_OPENSSL),, \ + LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + ) \ + LO_lib/_heapq.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_json.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_lsprof.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/math.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_md5.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/mmap.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_multibytecodec.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_multiprocessing.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_opcode.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/ossaudiodev.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/parser.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_pickle.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_posixsubprocess.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/pyexpat.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_queue.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_random.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/resource.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/select.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_sha1.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_sha256.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_sha3.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_sha512.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_socket.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/spwd.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + $(if $(DISABLE_OPENSSL),, \ + LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + ) \ + LO_lib/_struct.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/syslog.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/termios.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_testbuffer.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_testcapi.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_testimportmultiple.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_testmultiphase.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/unicodedata.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/xxlimited.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/_xxtestfuzz.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ + LO_lib/zlib.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ +)) +endif +endif + +# headers are not delivered, but used from unpacked dir Include/ +# (+ toplevel for pyconfig.h) + +ifeq ($(OS),LINUX) +python3_MACHDEP=linux +else +ifeq ($(OS),MACOSX) +python3_MACHDEP=darwin +endif +endif + +# that one is generated... +# note: python configure overrides config.guess with something that doesn't +# put -pc in its linux platform triplets, so filter that... +ifneq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\ + LO_lib/_sysconfigdata_m_$(python3_MACHDEP)_$(subst i686,i386,$(subst -pc,,$(HOST_PLATFORM))).py \ +)) +endif + +# packages not shipped: +# dbm, sqlite3 - need some database stuff +# curses - need curses to build the C module +# idlelib, tkinter, turtledemo - need Tk to build the C module +# test - probably unnecessary? was explicitly removed #i116738# +# venv - why would we need virtual environments + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\ + LICENSE \ + Lib/__future__.py \ + Lib/__phello__.foo.py \ + Lib/_bootlocale.py \ + Lib/_collections_abc.py \ + Lib/_compat_pickle.py \ + Lib/_compression.py \ + Lib/_dummy_thread.py \ + Lib/_markupbase.py \ + Lib/_osx_support.py \ + Lib/_pydecimal.py \ + Lib/_pyio.py \ + Lib/_sitebuiltins.py \ + Lib/_strptime.py \ + Lib/_threading_local.py \ + Lib/_weakrefset.py \ + Lib/abc.py \ + Lib/aifc.py \ + Lib/antigravity.py \ + Lib/argparse.py \ + Lib/ast.py \ + Lib/asynchat.py \ + Lib/asyncore.py \ + Lib/base64.py \ + Lib/bdb.py \ + Lib/binhex.py \ + Lib/bisect.py \ + Lib/bz2.py \ + Lib/calendar.py \ + Lib/cgi.py \ + Lib/cgitb.py \ + Lib/chunk.py \ + Lib/cmd.py \ + Lib/code.py \ + Lib/codecs.py \ + Lib/codeop.py \ + Lib/colorsys.py \ + Lib/compileall.py \ + Lib/configparser.py \ + Lib/contextlib.py \ + Lib/contextvars.py \ + Lib/copy.py \ + Lib/copyreg.py \ + Lib/cProfile.py \ + Lib/crypt.py \ + Lib/csv.py \ + Lib/dataclasses.py \ + Lib/datetime.py \ + Lib/decimal.py \ + Lib/difflib.py \ + Lib/dis.py \ + Lib/doctest.py \ + Lib/dummy_threading.py \ + Lib/enum.py \ + Lib/filecmp.py \ + Lib/fileinput.py \ + Lib/fnmatch.py \ + Lib/formatter.py \ + Lib/fractions.py \ + Lib/ftplib.py \ + Lib/functools.py \ + Lib/genericpath.py \ + Lib/getopt.py \ + Lib/getpass.py \ + Lib/gettext.py \ + Lib/glob.py \ + Lib/gzip.py \ + Lib/hashlib.py \ + Lib/heapq.py \ + Lib/hmac.py \ + Lib/imaplib.py \ + Lib/imghdr.py \ + Lib/imp.py \ + Lib/inspect.py \ + Lib/io.py \ + Lib/ipaddress.py \ + Lib/keyword.py \ + Lib/linecache.py \ + Lib/locale.py \ + Lib/lzma.py \ + Lib/macpath.py \ + Lib/mailbox.py \ + Lib/mailcap.py \ + Lib/mimetypes.py \ + Lib/modulefinder.py \ + Lib/netrc.py \ + Lib/nntplib.py \ + Lib/ntpath.py \ + Lib/nturl2path.py \ + Lib/numbers.py \ + Lib/opcode.py \ + Lib/operator.py \ + Lib/optparse.py \ + Lib/os.py \ + Lib/pathlib.py \ + Lib/pdb.py \ + Lib/pickle.py \ + Lib/pickletools.py \ + Lib/pipes.py \ + Lib/pkgutil.py \ + Lib/platform.py \ + Lib/plistlib.py \ + Lib/poplib.py \ + Lib/posixpath.py \ + Lib/pprint.py \ + Lib/profile.py \ + Lib/pstats.py \ + Lib/pty.py \ + Lib/pyclbr.py \ + Lib/_py_abc.py \ + Lib/py_compile.py \ + Lib/pydoc.py \ + Lib/queue.py \ + Lib/quopri.py \ + Lib/random.py \ + Lib/reprlib.py \ + Lib/re.py \ + Lib/rlcompleter.py \ + Lib/runpy.py \ + Lib/sched.py \ + Lib/secrets.py \ + Lib/shelve.py \ + Lib/selectors.py \ + Lib/shlex.py \ + Lib/shutil.py \ + Lib/signal.py \ + Lib/site.py \ + Lib/smtpd.py \ + Lib/smtplib.py \ + Lib/sndhdr.py \ + Lib/socket.py \ + Lib/socketserver.py \ + Lib/sre_compile.py \ + Lib/sre_constants.py \ + Lib/sre_parse.py \ + Lib/ssl.py \ + Lib/statistics.py \ + Lib/stat.py \ + Lib/stringprep.py \ + Lib/string.py \ + Lib/struct.py \ + Lib/subprocess.py \ + Lib/sunau.py \ + Lib/symbol.py \ + Lib/symtable.py \ + Lib/sysconfig.py \ + Lib/tabnanny.py \ + Lib/tarfile.py \ + Lib/telnetlib.py \ + Lib/tempfile.py \ + Lib/textwrap.py \ + Lib/this.py \ + Lib/threading.py \ + Lib/timeit.py \ + Lib/tokenize.py \ + Lib/token.py \ + Lib/traceback.py \ + Lib/trace.py \ + Lib/tty.py \ + Lib/turtle.py \ + Lib/types.py \ + Lib/typing.py \ + Lib/uu.py \ + Lib/uuid.py \ + Lib/warnings.py \ + Lib/wave.py \ + Lib/weakref.py \ + Lib/webbrowser.py \ + Lib/xdrlib.py \ + Lib/zipfile.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/asyncio,\ + Lib/asyncio/base_futures.py \ + Lib/asyncio/base_tasks.py \ + Lib/asyncio/format_helpers.py \ + Lib/asyncio/runners.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/collections,\ + Lib/collections/__init__.py \ + Lib/collections/abc.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/concurrent,\ + Lib/concurrent/__init__.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/concurrent/futures,\ + Lib/concurrent/futures/__init__.py \ + Lib/concurrent/futures/_base.py \ + Lib/concurrent/futures/process.py \ + Lib/concurrent/futures/thread.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/ctypes,\ + Lib/ctypes/__init__.py \ + Lib/ctypes/_aix.py \ + Lib/ctypes/_endian.py \ + Lib/ctypes/util.py \ + Lib/ctypes/wintypes.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/ctypes/macholib,\ + Lib/ctypes/macholib/README.ctypes \ + Lib/ctypes/macholib/fetch_macholib \ + Lib/ctypes/macholib/fetch_macholib.bat \ + Lib/ctypes/macholib/__init__.py \ + Lib/ctypes/macholib/dyld.py \ + Lib/ctypes/macholib/dylib.py \ + Lib/ctypes/macholib/framework.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/distutils,\ + Lib/distutils/README \ + Lib/distutils/__init__.py \ + Lib/distutils/_msvccompiler.py \ + Lib/distutils/archive_util.py \ + Lib/distutils/bcppcompiler.py \ + Lib/distutils/ccompiler.py \ + Lib/distutils/cmd.py \ + Lib/distutils/config.py \ + Lib/distutils/core.py \ + Lib/distutils/cygwinccompiler.py \ + Lib/distutils/debug.py \ + Lib/distutils/dep_util.py \ + Lib/distutils/dir_util.py \ + Lib/distutils/dist.py \ + Lib/distutils/errors.py \ + Lib/distutils/extension.py \ + Lib/distutils/fancy_getopt.py \ + Lib/distutils/filelist.py \ + Lib/distutils/file_util.py \ + Lib/distutils/log.py \ + Lib/distutils/msvc9compiler.py \ + Lib/distutils/msvccompiler.py \ + Lib/distutils/spawn.py \ + Lib/distutils/sysconfig.py \ + Lib/distutils/text_file.py \ + Lib/distutils/unixccompiler.py \ + Lib/distutils/util.py \ + Lib/distutils/versionpredicate.py \ + Lib/distutils/version.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/distutils/command,\ + Lib/distutils/command/__init__.py \ + Lib/distutils/command/bdist_dumb.py \ + Lib/distutils/command/bdist_msi.py \ + Lib/distutils/command/bdist.py \ + Lib/distutils/command/bdist_rpm.py \ + Lib/distutils/command/bdist_wininst.py \ + Lib/distutils/command/build_clib.py \ + Lib/distutils/command/build_ext.py \ + Lib/distutils/command/build.py \ + Lib/distutils/command/build_py.py \ + Lib/distutils/command/build_scripts.py \ + Lib/distutils/command/check.py \ + Lib/distutils/command/clean.py \ + Lib/distutils/command/command_template \ + Lib/distutils/command/config.py \ + Lib/distutils/command/install_data.py \ + Lib/distutils/command/install_egg_info.py \ + Lib/distutils/command/install_headers.py \ + Lib/distutils/command/install_lib.py \ + Lib/distutils/command/install.py \ + Lib/distutils/command/install_scripts.py \ + Lib/distutils/command/register.py \ + Lib/distutils/command/sdist.py \ + Lib/distutils/command/upload.py \ + Lib/distutils/command/wininst-10.0-amd64.exe \ + Lib/distutils/command/wininst-10.0.exe \ + Lib/distutils/command/wininst-14.0-amd64.exe \ + Lib/distutils/command/wininst-14.0.exe \ + Lib/distutils/command/wininst-6.0.exe \ + Lib/distutils/command/wininst-7.1.exe \ + Lib/distutils/command/wininst-8.0.exe \ + Lib/distutils/command/wininst-9.0-amd64.exe \ + Lib/distutils/command/wininst-9.0.exe \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/email,\ + Lib/email/__init__.py \ + Lib/email/_encoded_words.py \ + Lib/email/_header_value_parser.py \ + Lib/email/_parseaddr.py \ + Lib/email/_policybase.py \ + Lib/email/architecture.rst \ + Lib/email/base64mime.py \ + Lib/email/charset.py \ + Lib/email/contentmanager.py \ + Lib/email/encoders.py \ + Lib/email/errors.py \ + Lib/email/feedparser.py \ + Lib/email/generator.py \ + Lib/email/header.py \ + Lib/email/headerregistry.py \ + Lib/email/iterators.py \ + Lib/email/message.py \ + Lib/email/parser.py \ + Lib/email/policy.py \ + Lib/email/quoprimime.py \ + Lib/email/utils.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/email/mime,\ + Lib/email/mime/__init__.py \ + Lib/email/mime/application.py \ + Lib/email/mime/audio.py \ + Lib/email/mime/base.py \ + Lib/email/mime/image.py \ + Lib/email/mime/message.py \ + Lib/email/mime/multipart.py \ + Lib/email/mime/nonmultipart.py \ + Lib/email/mime/text.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/encodings,\ + Lib/encodings/__init__.py \ + Lib/encodings/aliases.py \ + Lib/encodings/ascii.py \ + Lib/encodings/base64_codec.py \ + Lib/encodings/big5hkscs.py \ + Lib/encodings/big5.py \ + Lib/encodings/bz2_codec.py \ + Lib/encodings/charmap.py \ + Lib/encodings/cp037.py \ + Lib/encodings/cp1006.py \ + Lib/encodings/cp1026.py \ + Lib/encodings/cp1125.py \ + Lib/encodings/cp1140.py \ + Lib/encodings/cp1250.py \ + Lib/encodings/cp1251.py \ + Lib/encodings/cp1252.py \ + Lib/encodings/cp1253.py \ + Lib/encodings/cp1254.py \ + Lib/encodings/cp1255.py \ + Lib/encodings/cp1256.py \ + Lib/encodings/cp1257.py \ + Lib/encodings/cp1258.py \ + Lib/encodings/cp424.py \ + Lib/encodings/cp437.py \ + Lib/encodings/cp500.py \ + Lib/encodings/cp65001.py \ + Lib/encodings/cp720.py \ + Lib/encodings/cp737.py \ + Lib/encodings/cp775.py \ + Lib/encodings/cp850.py \ + Lib/encodings/cp852.py \ + Lib/encodings/cp855.py \ + Lib/encodings/cp856.py \ + Lib/encodings/cp857.py \ + Lib/encodings/cp858.py \ + Lib/encodings/cp860.py \ + Lib/encodings/cp861.py \ + Lib/encodings/cp862.py \ + Lib/encodings/cp863.py \ + Lib/encodings/cp864.py \ + Lib/encodings/cp865.py \ + Lib/encodings/cp866.py \ + Lib/encodings/cp869.py \ + Lib/encodings/cp874.py \ + Lib/encodings/cp875.py \ + Lib/encodings/cp932.py \ + Lib/encodings/cp949.py \ + Lib/encodings/cp950.py \ + Lib/encodings/euc_jis_2004.py \ + Lib/encodings/euc_jisx0213.py \ + Lib/encodings/euc_jp.py \ + Lib/encodings/euc_kr.py \ + Lib/encodings/gb18030.py \ + Lib/encodings/gb2312.py \ + Lib/encodings/gbk.py \ + Lib/encodings/hex_codec.py \ + Lib/encodings/hp_roman8.py \ + Lib/encodings/hz.py \ + Lib/encodings/idna.py \ + Lib/encodings/iso2022_jp_1.py \ + Lib/encodings/iso2022_jp_2004.py \ + Lib/encodings/iso2022_jp_2.py \ + Lib/encodings/iso2022_jp_3.py \ + Lib/encodings/iso2022_jp_ext.py \ + Lib/encodings/iso2022_jp.py \ + Lib/encodings/iso2022_kr.py \ + Lib/encodings/iso8859_10.py \ + Lib/encodings/iso8859_11.py \ + Lib/encodings/iso8859_13.py \ + Lib/encodings/iso8859_14.py \ + Lib/encodings/iso8859_15.py \ + Lib/encodings/iso8859_16.py \ + Lib/encodings/iso8859_1.py \ + Lib/encodings/iso8859_2.py \ + Lib/encodings/iso8859_3.py \ + Lib/encodings/iso8859_4.py \ + Lib/encodings/iso8859_5.py \ + Lib/encodings/iso8859_6.py \ + Lib/encodings/iso8859_7.py \ + Lib/encodings/iso8859_8.py \ + Lib/encodings/iso8859_9.py \ + Lib/encodings/johab.py \ + Lib/encodings/koi8_r.py \ + Lib/encodings/koi8_t.py \ + Lib/encodings/koi8_u.py \ + Lib/encodings/kz1048.py \ + Lib/encodings/latin_1.py \ + Lib/encodings/mac_arabic.py \ + Lib/encodings/mac_centeuro.py \ + Lib/encodings/mac_croatian.py \ + Lib/encodings/mac_cyrillic.py \ + Lib/encodings/mac_farsi.py \ + Lib/encodings/mac_greek.py \ + Lib/encodings/mac_iceland.py \ + Lib/encodings/mac_latin2.py \ + Lib/encodings/mac_romanian.py \ + Lib/encodings/mac_roman.py \ + Lib/encodings/mac_turkish.py \ + Lib/encodings/mbcs.py \ + Lib/encodings/oem.py \ + Lib/encodings/palmos.py \ + Lib/encodings/ptcp154.py \ + Lib/encodings/punycode.py \ + Lib/encodings/quopri_codec.py \ + Lib/encodings/raw_unicode_escape.py \ + Lib/encodings/rot_13.py \ + Lib/encodings/shift_jis_2004.py \ + Lib/encodings/shift_jis.py \ + Lib/encodings/shift_jisx0213.py \ + Lib/encodings/tis_620.py \ + Lib/encodings/undefined.py \ + Lib/encodings/unicode_escape.py \ + Lib/encodings/unicode_internal.py \ + Lib/encodings/utf_16_be.py \ + Lib/encodings/utf_16_le.py \ + Lib/encodings/utf_16.py \ + Lib/encodings/utf_32_be.py \ + Lib/encodings/utf_32_le.py \ + Lib/encodings/utf_32.py \ + Lib/encodings/utf_7.py \ + Lib/encodings/utf_8.py \ + Lib/encodings/utf_8_sig.py \ + Lib/encodings/uu_codec.py \ + Lib/encodings/zlib_codec.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/html,\ + Lib/html/__init__.py \ + Lib/html/entities.py \ + Lib/html/parser.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/http,\ + Lib/http/__init__.py \ + Lib/http/client.py \ + Lib/http/cookiejar.py \ + Lib/http/cookies.py \ + Lib/http/server.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/importlib,\ + Lib/importlib/__init__.py \ + Lib/importlib/_bootstrap.py \ + Lib/importlib/_bootstrap_external.py \ + Lib/importlib/abc.py \ + Lib/importlib/machinery.py \ + Lib/importlib/resources.py \ + Lib/importlib/util.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/json,\ + Lib/json/__init__.py \ + Lib/json/decoder.py \ + Lib/json/encoder.py \ + Lib/json/scanner.py \ + Lib/json/tool.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib2to3,\ + Lib/lib2to3/__init__.py \ + Lib/lib2to3/__main__.py \ + Lib/lib2to3/Grammar.txt \ + Lib/lib2to3/PatternGrammar.txt \ + Lib/lib2to3/btm_matcher.py \ + Lib/lib2to3/btm_utils.py \ + Lib/lib2to3/fixer_base.py \ + Lib/lib2to3/fixer_util.py \ + Lib/lib2to3/main.py \ + Lib/lib2to3/patcomp.py \ + Lib/lib2to3/pygram.py \ + Lib/lib2to3/pytree.py \ + Lib/lib2to3/refactor.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib2to3/fixes,\ + Lib/lib2to3/fixes/__init__.py \ + Lib/lib2to3/fixes/fix_apply.py \ + Lib/lib2to3/fixes/fix_asserts.py \ + Lib/lib2to3/fixes/fix_basestring.py \ + Lib/lib2to3/fixes/fix_buffer.py \ + Lib/lib2to3/fixes/fix_dict.py \ + Lib/lib2to3/fixes/fix_except.py \ + Lib/lib2to3/fixes/fix_execfile.py \ + Lib/lib2to3/fixes/fix_exec.py \ + Lib/lib2to3/fixes/fix_exitfunc.py \ + Lib/lib2to3/fixes/fix_filter.py \ + Lib/lib2to3/fixes/fix_funcattrs.py \ + Lib/lib2to3/fixes/fix_future.py \ + Lib/lib2to3/fixes/fix_getcwdu.py \ + Lib/lib2to3/fixes/fix_has_key.py \ + Lib/lib2to3/fixes/fix_idioms.py \ + Lib/lib2to3/fixes/fix_import.py \ + Lib/lib2to3/fixes/fix_imports2.py \ + Lib/lib2to3/fixes/fix_imports.py \ + Lib/lib2to3/fixes/fix_input.py \ + Lib/lib2to3/fixes/fix_intern.py \ + Lib/lib2to3/fixes/fix_isinstance.py \ + Lib/lib2to3/fixes/fix_itertools_imports.py \ + Lib/lib2to3/fixes/fix_itertools.py \ + Lib/lib2to3/fixes/fix_long.py \ + Lib/lib2to3/fixes/fix_map.py \ + Lib/lib2to3/fixes/fix_metaclass.py \ + Lib/lib2to3/fixes/fix_methodattrs.py \ + Lib/lib2to3/fixes/fix_ne.py \ + Lib/lib2to3/fixes/fix_next.py \ + Lib/lib2to3/fixes/fix_nonzero.py \ + Lib/lib2to3/fixes/fix_numliterals.py \ + Lib/lib2to3/fixes/fix_operator.py \ + Lib/lib2to3/fixes/fix_paren.py \ + Lib/lib2to3/fixes/fix_print.py \ + Lib/lib2to3/fixes/fix_raise.py \ + Lib/lib2to3/fixes/fix_raw_input.py \ + Lib/lib2to3/fixes/fix_reduce.py \ + Lib/lib2to3/fixes/fix_reload.py \ + Lib/lib2to3/fixes/fix_renames.py \ + Lib/lib2to3/fixes/fix_repr.py \ + Lib/lib2to3/fixes/fix_set_literal.py \ + Lib/lib2to3/fixes/fix_standarderror.py \ + Lib/lib2to3/fixes/fix_sys_exc.py \ + Lib/lib2to3/fixes/fix_throw.py \ + Lib/lib2to3/fixes/fix_tuple_params.py \ + Lib/lib2to3/fixes/fix_types.py \ + Lib/lib2to3/fixes/fix_unicode.py \ + Lib/lib2to3/fixes/fix_urllib.py \ + Lib/lib2to3/fixes/fix_ws_comma.py \ + Lib/lib2to3/fixes/fix_xrange.py \ + Lib/lib2to3/fixes/fix_xreadlines.py \ + Lib/lib2to3/fixes/fix_zip.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pgen2,\ + Lib/lib2to3/pgen2/__init__.py \ + Lib/lib2to3/pgen2/conv.py \ + Lib/lib2to3/pgen2/driver.py \ + Lib/lib2to3/pgen2/grammar.py \ + Lib/lib2to3/pgen2/literals.py \ + Lib/lib2to3/pgen2/parse.py \ + Lib/lib2to3/pgen2/pgen.py \ + Lib/lib2to3/pgen2/tokenize.py \ + Lib/lib2to3/pgen2/token.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/logging,\ + Lib/logging/__init__.py \ + Lib/logging/config.py \ + Lib/logging/handlers.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/multiprocessing,\ + Lib/multiprocessing/__init__.py \ + Lib/multiprocessing/connection.py \ + Lib/multiprocessing/context.py \ + Lib/multiprocessing/forkserver.py \ + Lib/multiprocessing/heap.py \ + Lib/multiprocessing/managers.py \ + Lib/multiprocessing/popen_fork.py \ + Lib/multiprocessing/popen_forkserver.py \ + Lib/multiprocessing/popen_spawn_posix.py \ + Lib/multiprocessing/popen_spawn_win32.py \ + Lib/multiprocessing/process.py \ + Lib/multiprocessing/queues.py \ + Lib/multiprocessing/reduction.py \ + Lib/multiprocessing/resource_sharer.py \ + Lib/multiprocessing/semaphore_tracker.py \ + Lib/multiprocessing/sharedctypes.py \ + Lib/multiprocessing/spawn.py \ + Lib/multiprocessing/synchronize.py \ + Lib/multiprocessing/util.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/multiprocessing/dummy,\ + Lib/multiprocessing/dummy/__init__.py \ + Lib/multiprocessing/dummy/connection.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pydoc_data,\ + Lib/pydoc_data/__init__.py \ + Lib/pydoc_data/_pydoc.css \ + Lib/pydoc_data/topics.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/unittest,\ + Lib/unittest/__init__.py \ + Lib/unittest/__main__.py \ + Lib/unittest/case.py \ + Lib/unittest/loader.py \ + Lib/unittest/main.py \ + Lib/unittest/mock.py \ + Lib/unittest/result.py \ + Lib/unittest/runner.py \ + Lib/unittest/signals.py \ + Lib/unittest/suite.py \ + Lib/unittest/util.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/unittest/test,\ + Lib/unittest/test/__init__.py \ + Lib/unittest/test/__main__.py \ + Lib/unittest/test/_test_warnings.py \ + Lib/unittest/test/dummy.py \ + Lib/unittest/test/support.py \ + Lib/unittest/test/test_assertions.py \ + Lib/unittest/test/test_break.py \ + Lib/unittest/test/test_case.py \ + Lib/unittest/test/test_discovery.py \ + Lib/unittest/test/test_functiontestcase.py \ + Lib/unittest/test/test_loader.py \ + Lib/unittest/test/test_program.py \ + Lib/unittest/test/test_result.py \ + Lib/unittest/test/test_runner.py \ + Lib/unittest/test/test_setups.py \ + Lib/unittest/test/test_skipping.py \ + Lib/unittest/test/test_suite.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/unittest/test/testmock,\ + Lib/unittest/test/testmock/__init__.py \ + Lib/unittest/test/testmock/__main__.py \ + Lib/unittest/test/testmock/support.py \ + Lib/unittest/test/testmock/testcallable.py \ + Lib/unittest/test/testmock/testhelpers.py \ + Lib/unittest/test/testmock/testmagicmethods.py \ + Lib/unittest/test/testmock/testmock.py \ + Lib/unittest/test/testmock/testpatch.py \ + Lib/unittest/test/testmock/testsealable.py \ + Lib/unittest/test/testmock/testsentinel.py \ + Lib/unittest/test/testmock/testwith.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/urllib,\ + Lib/urllib/__init__.py \ + Lib/urllib/error.py \ + Lib/urllib/parse.py \ + Lib/urllib/request.py \ + Lib/urllib/response.py \ + Lib/urllib/robotparser.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/wsgiref,\ + Lib/wsgiref/__init__.py \ + Lib/wsgiref/handlers.py \ + Lib/wsgiref/headers.py \ + Lib/wsgiref/simple_server.py \ + Lib/wsgiref/util.py \ + Lib/wsgiref/validate.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xml,\ + Lib/xml/__init__.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xml/dom,\ + Lib/xml/dom/__init__.py \ + Lib/xml/dom/NodeFilter.py \ + Lib/xml/dom/domreg.py \ + Lib/xml/dom/expatbuilder.py \ + Lib/xml/dom/minicompat.py \ + Lib/xml/dom/minidom.py \ + Lib/xml/dom/pulldom.py \ + Lib/xml/dom/xmlbuilder.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xml/etree,\ + Lib/xml/etree/__init__.py \ + Lib/xml/etree/ElementInclude.py \ + Lib/xml/etree/ElementPath.py \ + Lib/xml/etree/ElementTree.py \ + Lib/xml/etree/cElementTree.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xml/parsers,\ + Lib/xml/parsers/__init__.py \ + Lib/xml/parsers/expat.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xml/sax,\ + Lib/xml/sax/__init__.py \ + Lib/xml/sax/_exceptions.py \ + Lib/xml/sax/expatreader.py \ + Lib/xml/sax/handler.py \ + Lib/xml/sax/saxutils.py \ + Lib/xml/sax/xmlreader.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xmlrpc,\ + Lib/xmlrpc/__init__.py \ + Lib/xmlrpc/client.py \ + Lib/xmlrpc/server.py \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/site-packages,\ + Lib/site-packages/README.txt \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk new file mode 100644 index 000000000..91c6c1948 --- /dev/null +++ b/external/python3/ExternalProject_python3.mk @@ -0,0 +1,184 @@ +# -*- 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,python3)) + +$(eval $(call gb_ExternalProject_use_externals,python3,\ + expat \ + $(if $(filter LINUX,$(OS)),libffi) \ + openssl \ + zlib \ +)) + +$(eval $(call gb_ExternalProject_register_targets,python3,\ + build \ + $(if $(filter MACOSX,$(OS)),\ + fixscripts \ + fixinstallnames \ + executables \ + removeunnecessarystuff \ + ) \ +)) + +ifeq ($(OS),WNT) + +# TODO: using Debug configuration and related mangling of pyconfig.h + +# at least for MSVC 2008 it is necessary to clear MAKEFLAGS because +# nmake is invoked +$(call gb_ExternalProject_get_state_target,python3,build) : + $(call gb_Trace_StartRange,python3,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \ + /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ + /p:opensslIncludeDir=$(call gb_UnpackedTarball_get_dir,openssl)/include \ + /p:opensslOutDir=$(call gb_UnpackedTarball_get_dir,openssl)/out32dll \ + /p:zlibDir=$(call gb_UnpackedTarball_get_dir,zlib) \ + /maxcpucount \ + $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \ + $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ + ,PCBuild) + $(call gb_Trace_EndRange,python3,EXTERNAL) + +else + +# --with-system-expat: this should find the one in the workdir (or system) + +# OPENSSL_INCLUDES OPENSSL_LDFLAGS OPENSSL_LIBS cannot be set via commandline! +# use --with-openssl instead, which requires include/ and lib/ subdirs. + +# libffi is not all that stable, with 3 different SONAMEs currently, so we +# have to bundle it; --without-system-ffi does not work any more on Linux. +# Unfortuantely (as of 3.7) pkg-config is used to locate libffi so we do some +# hacks to find the libffi.pc in workdir by overriding PKG_CONFIG_LIBDIR. +# Also, pkg-config is only used to find the headers, the libdir needs to be +# passed extra. + +# create a symlink "LO_lib" because the .so are in a directory with platform +# specific name like build/lib.linux-x86_64-3.3 + +python3_cflags = $(ZLIB_CFLAGS) +ifneq (,$(ENABLE_VALGRIND)) + python3_cflags += $(VALGRIND_CFLAGS) +endif + +# This happens to override the -O3 in the default OPT set in +# workdir/UnpackedTarball/python3/configure.ac while keeping the other content of that OPT intact: +ifeq ($(ENABLE_OPTIMIZED),) +python3_cflags += $(gb_COMPILERNOOPTFLAGS) +endif + +$(call gb_ExternalProject_get_state_target,python3,build) : + $(call gb_Trace_StartRange,python3,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(if $(filter MACOSX,$(OS)), \ + $(if $(filter 10.8 10.9 10.10 10.11,$(MACOSX_DEPLOYMENT_TARGET)), \ + ac_cv_func_getentropy=no \ + ac_cv_func_clock_gettime=no \ + ) \ + ) \ + ./configure \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(ENABLE_VALGRIND),--with-valgrind) \ + --prefix=/python-inst \ + --with-system-expat \ + $(if $(filter AIX,$(OS)), \ + --disable-ipv6 --with-threads OPT="-g0 -fwrapv -O3 -Wall") \ + $(if $(filter MACOSX,$(OS)), \ + $(if $(filter INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) \ + --with-universal-archs=intel \ + ) \ + --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ + --enable-shared \ + $(if $(filter 1090 101000 101100 101200,$(MAC_OS_X_VERSION_MIN_REQUIRED)),ac_cv_func_utimensat=no) \ + ) \ + $(if $(SYSTEM_OPENSSL)$(DISABLE_OPENSSL),,\ + --with-openssl=$(call gb_UnpackedTarball_get_dir,openssl) \ + ) \ + $(if $(filter LINUX,$(OS)), \ + PKG_CONFIG_LIBDIR="$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)$${PKG_CONFIG_LIBDIR:+:$$PKG_CONFIG_LIBDIR}" \ + ) \ + CC="$(strip $(CC) \ + $(if $(SYSTEM_EXPAT),,-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \ + $(if $(SYSBASE), -I$(SYSBASE)/usr/include) \ + )" \ + $(if $(python3_cflags),CFLAGS='$(python3_cflags)') \ + $(if $(filter -fsanitize=%,$(CC)),LINKCC="$(CXX) -pthread") \ + LDFLAGS="$(strip $(LDFLAGS) \ + $(if $(filter LINUX,$(OS)),-L$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/.libs) \ + $(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \ + $(if $(SYSTEM_ZLIB),,-L$(gb_StaticLibrary_WORKDIR)) \ + $(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \ + $(gb_LTOFLAGS) \ + )" \ + && MAKEFLAGS= $(MAKE) \ + $(if $(filter MACOSX,$(OS)),DESTDIR=$(EXTERNAL_WORKDIR)/python-inst install) \ + $(if $(SYSTEM_ZLIB),,ZLIB_INCDIR=$(WORKDIR)/UnpackedTarball/zlib) \ + && ln -s build/lib.* LO_lib \ + ) + $(call gb_Trace_EndRange,python3,EXTERNAL) + +endif + +ifeq ($(OS),MACOSX) + +python3_fw_prefix=$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework + +# rule to allow relocating the whole framework, removing reference to buildinstallation directory +$(call gb_ExternalProject_get_state_target,python3,fixscripts) : $(call gb_ExternalProject_get_state_target,python3,build) + $(call gb_Output_announce,python3 - remove reference to installroot from scripts,build,CUS,5) + $(COMMAND_ECHO)for file in \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/2to3 \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/2to3-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/idle$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/pydoc$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)-config \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m-config \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/pyvenv-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) ; do \ + { rm "$$file" && $(gb_AWK) '\ + BEGIN {print "#!/bin/bash\n\ +origpath=$$(pwd)\n\ +bindir=$$(cd $$(dirname \"$$0\") ; pwd)\n\ +cd \"$$origpath\"\n\ +\"$$bindir/../Resources/Python.app/Contents/MacOS/LibreOfficePython\" - $$@ <<EOF"} \ + FNR==1{next} \ + {print} \ + END {print "EOF"}' > "$$file" ; } < "$$file" ; chmod +x "$$file" ; done + touch $@ + +$(call gb_ExternalProject_get_state_target,python3,fixinstallnames) : $(call gb_ExternalProject_get_state_target,python3,build) + $(INSTALL_NAME_TOOL) -change \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ + @executable_path/../../../../LibreOfficePython \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython + for file in $(shell $(FIND) $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload -name "*.so") ; do \ + $(INSTALL_NAME_TOOL) -change \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ + @loader_path/../../../LibreOfficePython $$file ; done + touch $@ + +# also delete binaries that are symlinked in scp2 +$(call gb_ExternalProject_get_state_target,python3,executables) : $(call gb_ExternalProject_get_state_target,python3,build) + cd $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin ; \ + for file in python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ + python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m ; do \ + $(INSTALL_NAME_TOOL) -change \ + $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ + @executable_path/../LibreOfficePython $$file ; done + touch $@ + +$(call gb_ExternalProject_get_state_target,python3,removeunnecessarystuff) : $(call gb_ExternalProject_get_state_target,python3,build) + $(call gb_Output_announce,python3 - remove the stuff we don't need to ship,build,CUS,5) + rm -rf $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/test + touch $@ + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/python3/GeneratedPackage_python3.mk b/external/python3/GeneratedPackage_python3.mk new file mode 100644 index 000000000..ffde38be5 --- /dev/null +++ b/external/python3/GeneratedPackage_python3.mk @@ -0,0 +1,18 @@ +# -*- 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_GeneratedPackage_GeneratedPackage,python3,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO)) + +$(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3)) + +$(eval $(call gb_GeneratedPackage_use_external_project,python3,python3)) + +$(eval $(call gb_GeneratedPackage_add_dir,python3,$(INSTROOT)/Frameworks/LibreOfficePython.framework,LibreOfficePython.framework)) + +# vim: set noet sw=4 ts=4: diff --git a/external/python3/Makefile b/external/python3/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/python3/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/python3/Module_python3.mk b/external/python3/Module_python3.mk new file mode 100644 index 000000000..5ef1deb21 --- /dev/null +++ b/external/python3/Module_python3.mk @@ -0,0 +1,22 @@ +# -*- 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,python3)) + +ifneq ($(DISABLE_PYTHON),TRUE) + +$(eval $(call gb_Module_add_targets,python3,\ + UnpackedTarball_python3 \ + ExternalProject_python3 \ + $(if $(filter MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3) \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/python3/README b/external/python3/README new file mode 100644 index 000000000..edde023af --- /dev/null +++ b/external/python3/README @@ -0,0 +1 @@ +CPython implementation of Python 3 from http://www.python.org diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk new file mode 100644 index 000000000..fb693e70d --- /dev/null +++ b/external/python3/UnpackedTarball_python3.mk @@ -0,0 +1,48 @@ +# -*- 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,python3)) + +$(eval $(call gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL),,python3)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\ + PCbuild/pcbuild.sln \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,python3,\ + external/python3/i100492-freebsd.patch.1 \ + external/python3/python-3.3.0-darwin.patch.1 \ + external/python3/python-3.7.6-msvc-ssl.patch.1 \ + external/python3/python-3.5.4-msvc-disable.patch.1 \ + external/python3/python-3.3.0-clang.patch.1 \ + external/python3/ubsan.patch.0 \ + external/python3/python-3.5.tweak.strip.soabi.patch \ + external/python3/darwin.patch.0 \ + external/python3/macos-11.patch.0 \ +)) + +ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),) +$(eval $(call gb_UnpackedTarball_add_patches,python3,\ + external/python3/python-3.3.3-elf-rpath.patch.1 \ +)) +endif + +ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE) +$(eval $(call gb_UnpackedTarball_add_patches,python3,\ + external/python3/python-3.3.3-disable-obmalloc.patch.0 \ +)) +endif + +ifneq ($(SYSTEM_ZLIB),TRUE) +$(eval $(call gb_UnpackedTarball_add_patches,python3, \ + external/python3/internal-zlib.patch.0 \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/python3/darwin.patch.0 b/external/python3/darwin.patch.0 new file mode 100644 index 000000000..139cdc978 --- /dev/null +++ b/external/python3/darwin.patch.0 @@ -0,0 +1,10 @@ +--- Modules/_ctypes/libffi_osx/x86/darwin64.S ++++ Modules/_ctypes/libffi_osx/x86/darwin64.S +@@ -29,7 +29,6 @@ + #include <fficonfig.h> + #include <ffi.h> + +- .file "darwin64.S" + .text + + /* ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags, diff --git a/external/python3/i100492-freebsd.patch.1 b/external/python3/i100492-freebsd.patch.1 new file mode 100644 index 000000000..074e5fc48 --- /dev/null +++ b/external/python3/i100492-freebsd.patch.1 @@ -0,0 +1,35 @@ +FreeBSD porting fixes, patch by maho@openoffice.org + +--- Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:00:41.097955124 +0000 ++++ Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:01:13.018329351 +0000 +@@ -186,6 +189,9 @@ + { + pthread_t th; + int status; ++#ifdef __FreeBSD__ ++ sigset_t set, oset; ++#endif + #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) + pthread_attr_t attrs; + #endif +@@ -214,6 +220,10 @@ + callback->func = func; + callback->arg = arg; + ++#ifdef __FreeBSD__ ++ sigfillset(&set); ++ SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset); ++#endif + status = pthread_create(&th, + #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) + &attrs, +@@ -225,6 +234,9 @@ + #endif + pythread_wrapper, callback); + ++#ifdef __FreeBSD__ ++ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL); ++#endif + #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) + pthread_attr_destroy(&attrs); + #endif diff --git a/external/python3/internal-zlib.patch.0 b/external/python3/internal-zlib.patch.0 new file mode 100644 index 000000000..abe2630bd --- /dev/null +++ b/external/python3/internal-zlib.patch.0 @@ -0,0 +1,55 @@ +--- configure ++++ configure +@@ -11607,13 +11607,13 @@ + ;; + esac + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5 +-$as_echo_n "checking for inflateCopy in -lz... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lzlib" >&5 ++$as_echo_n "checking for inflateCopy in -lzlib... " >&6; } + if ${ac_cv_lib_z_inflateCopy+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $LIBS" ++LIBS="-lzlib $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +--- setup.py ++++ setup.py +@@ -1362,7 +1362,7 @@ + # + # You can upgrade zlib to version 1.1.4 yourself by going to + # http://www.gzip.org/zlib/ +- zlib_inc = find_file('zlib.h', [], inc_dirs) ++ zlib_inc = [os.environ.get('ZLIB_INCDIR')] + have_zlib = False + if zlib_inc is not None: + zlib_h = zlib_inc[0] + '/zlib.h' +@@ -1379,13 +1379,13 @@ + version = line.split()[2] + break + if version >= version_req: +- if (self.compiler.find_library_file(lib_dirs, 'z')): ++ if (self.compiler.find_library_file(lib_dirs, 'zlib')): + if host_platform == "darwin": + zlib_extra_link_args = ('-Wl,-search_paths_first',) + else: + zlib_extra_link_args = () + exts.append( Extension('zlib', ['zlibmodule.c'], +- libraries = ['z'], ++ libraries = ['zlib'], + extra_link_args = zlib_extra_link_args)) + have_zlib = True + else: +@@ -1399,7 +1399,7 @@ + # crc32 if we have it. Otherwise binascii uses its own. + if have_zlib: + extra_compile_args = ['-DUSE_ZLIB_CRC32'] +- libraries = ['z'] ++ libraries = ['zlib'] + extra_link_args = zlib_extra_link_args + else: + extra_compile_args = [] diff --git a/external/python3/macos-11.patch.0 b/external/python3/macos-11.patch.0 new file mode 100644 index 000000000..d3dbbf605 --- /dev/null +++ b/external/python3/macos-11.patch.0 @@ -0,0 +1,59 @@ +-*- Mode: diff -*- +--- configure ++++ configure +@@ -3374,7 +3374,7 @@ + # has no effect, don't bother defining them + Darwin/[6789].*) + define_xopen_source=no;; +- Darwin/1[0-9].*) ++ Darwin/[12][0-9].*) + define_xopen_source=no;; + # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but + # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined +@@ -9372,6 +9275,9 @@ + esac + else + case `/usr/bin/arch` in ++ arm64) ++ MACOSX_DEFAULT_ARCH="arm64" ++ ;; + i386) + MACOSX_DEFAULT_ARCH="x86_64" + ;; +--- Mac/Tools/pythonw.c ++++ Mac/Tools/pythonw.c +@@ -121,6 +121,8 @@ + cpu_types[0] = CPU_TYPE_POWERPC; + #elif defined(__i386__) + cpu_types[0] = CPU_TYPE_X86; ++#elif defined(__arm64__) ++ cpu_types[0] = CPU_TYPE_ARM64; + #else + # error "Unknown CPU" + #endif +--- setup.py ++++ setup.py +@@ -670,7 +670,10 @@ + add_dir_to_list(self.compiler.include_dirs, + sysconfig.get_config_var("INCLUDEDIR")) + +- system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib'] ++ if host_platform == 'darwin': ++ system_lib_dirs = ['/usr/lib', macosx_sdk_root()+'/usr/lib'] ++ else: ++ system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib'] + system_include_dirs = ['/usr/include'] + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can +--- Modules/_decimal/libmpdec/mpdecimal.h ++++ Modules/_decimal/libmpdec/mpdecimal.h +@@ -135,6 +135,9 @@ + #elif defined(__x86_64__) + #define CONFIG_64 + #define ASM ++ #elif defined(__arm64__) ++ #define CONFIG_64 ++ #define ANSI + #else + #error "unknown architecture for universal build." + #endif diff --git a/external/python3/python-3.3.0-clang.patch.1 b/external/python3/python-3.3.0-clang.patch.1 new file mode 100644 index 000000000..9001110fb --- /dev/null +++ b/external/python3/python-3.3.0-clang.patch.1 @@ -0,0 +1,13 @@ +-*- Mode: diff -*- + +--- python3/setup.py ++++ python3/setup.py +@@ -436,7 +436,7 @@ + if ret >> 8 == 0: + with open(tmpfile) as fp: + for line in fp.readlines(): +- if line.startswith("gcc version"): ++ if line.startswith("gcc version") or line.startswith("clang -cc1 version"): + is_gcc = True + elif line.startswith("#include <...>"): + in_incdirs = True diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1 new file mode 100644 index 000000000..d5cb17e33 --- /dev/null +++ b/external/python3/python-3.3.0-darwin.patch.1 @@ -0,0 +1,81 @@ +-*- Mode: diff -*- + +LO needs to build both against MacOSX SDK and not produce universal binaries. + +diff -ru python3.orig/configure python3/configure +--- python3.orig/configure 2015-07-26 17:36:11.808497783 +0200 ++++ python3/configure 2015-07-26 17:38:49.016508337 +0200 +@@ -6794,7 +6794,20 @@ + then + case "$UNIVERSAL_ARCHS" in + 32-bit) +- UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386" ++ # LO does not use Universal Binaries (but the only way to set a SDK ++ # here implies that, so de-universalize here...) ++ case `/usr/bin/arch` in ++ i386) ++ UNIVERSAL_ARCH_FLAGS="-arch i386" ++ ;; ++ ppc) ++ UNIVERSAL_ARCH_FLAGS="" ++ ;; ++ *) ++ as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5 ++ ;; ++ esac ++ + LIPO_32BIT_FLAGS="" + ARCH_RUN_32BIT="" + ;; +diff -ru python3.orig/Mac/Makefile.in python3/Mac/Makefile.in +--- python3.orig/Mac/Makefile.in 2015-07-05 18:50:07.000000000 +0200 ++++ python3/Mac/Makefile.in 2015-07-26 17:40:14.860514100 +0200 +@@ -43,7 +43,7 @@ + INSTALL_SCRIPT= @INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + LN=@LN@ +-STRIPFLAG=-s ++STRIPFLAG= + CPMAC=CpMac + + APPTEMPLATE=$(srcdir)/Resources/app +diff -ru python3.orig/Mac/Resources/app/Info.plist.in python3/Mac/Resources/app/Info.plist.in +--- python3.orig/Mac/Resources/app/Info.plist.in 2015-07-05 18:50:07.000000000 +0200 ++++ python3/Mac/Resources/app/Info.plist.in 2015-07-26 17:42:00.974521224 +0200 +@@ -18,7 +18,7 @@ + </dict> + </array> + <key>CFBundleExecutable</key> +- <string>Python</string> ++ <string>LibreOfficePython</string> + <key>CFBundleGetInfoString</key> + <string>%version%, (c) 2001-2016 Python Software Foundation.</string> + <key>CFBundleHelpBookFolder</key> +diff -ru python3.orig/Mac/Resources/framework/Info.plist.in python3/Mac/Resources/framework/Info.plist.in +--- python3.orig/Mac/Resources/framework/Info.plist.in 2015-07-05 18:50:07.000000000 +0200 ++++ python3/Mac/Resources/framework/Info.plist.in 2015-07-26 17:41:15.996518204 +0200 +@@ -5,7 +5,7 @@ + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> +- <string>Python</string> ++ <string>@PYTHONFRAMEWORK@</string> + <key>CFBundleGetInfoString</key> + <string>Python Runtime and Library</string> + <key>CFBundleIdentifier</key> +diff -ru python3.orig/setup.py python3/setup.py +--- python3.orig/setup.py 2015-07-26 17:36:11.804497783 +0200 ++++ python3/setup.py 2015-07-26 17:39:48.599512337 +0200 +@@ -468,11 +468,11 @@ + # Ensure that /usr/local is always used, but the local build + # directories (i.e. '.' and 'Include') must be first. See issue + # 10520. +- if not cross_compiling: ++ if not cross_compiling and host_platform != 'darwin': + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + # only change this for cross builds for 3.3, issues on Mageia +- if cross_compiling: ++ if cross_compiling or host_platform == 'darwin': + self.add_gcc_paths() + self.add_multiarch_paths() diff --git a/external/python3/python-3.3.3-disable-obmalloc.patch.0 b/external/python3/python-3.3.3-disable-obmalloc.patch.0 new file mode 100644 index 000000000..0963a5f1b --- /dev/null +++ b/external/python3/python-3.3.3-disable-obmalloc.patch.0 @@ -0,0 +1,21 @@ +--- Objects/obmalloc.c ++++ Objects/obmalloc.c +@@ -413,8 +413,8 @@ + + #ifdef WITH_PYMALLOC + ++#define WITH_VALGRIND + #ifdef WITH_VALGRIND +-#include <valgrind/valgrind.h> + + /* If we're using GCC, use __builtin_expect() to reduce overhead of + the valgrind checks */ +@@ -1181,7 +1181,7 @@ + + #ifdef WITH_VALGRIND + if (UNLIKELY(running_on_valgrind == -1)) { +- running_on_valgrind = RUNNING_ON_VALGRIND; ++ running_on_valgrind = 1; + } + if (UNLIKELY(running_on_valgrind)) { + return NULL; diff --git a/external/python3/python-3.3.3-elf-rpath.patch.1 b/external/python3/python-3.3.3-elf-rpath.patch.1 new file mode 100644 index 000000000..0dfa16c8c --- /dev/null +++ b/external/python3/python-3.3.3-elf-rpath.patch.1 @@ -0,0 +1,27 @@ +set RPATH (only to be used on ELF platforms) + +(currently nothing in LO actually links libpython3.so) + +diff -ru python3.orig/Makefile.pre.in python3/Makefile.pre.in +--- python3.orig/Makefile.pre.in 2015-07-26 20:29:07.126194320 +0200 ++++ python3/Makefile.pre.in 2015-07-26 20:37:21.814227530 +0200 +@@ -550,7 +550,7 @@ + + # Build the interpreter + $(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) +- $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ++ $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -Wl,-rpath,\$$ORIGIN + + platform: $(BUILDPYTHON) pybuilddir.txt + $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform +--- python3.orig/Makefile.pre.in 2015-07-05 18:50:07.000000000 +0200 ++++ python3/Makefile.pre.in 2015-07-26 17:34:00.386488960 +0200 +@@ -607,7 +607,7 @@ + fi + + libpython3.so: libpython$(LDVERSION).so +- $(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^ ++ $(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^ -Wl,-rpath,\$$ORIGIN + + libpython$(LDVERSION).dylib: $(LIBRARY_OBJS) + $(CC) -dynamiclib -Wl,-single_module $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ diff --git a/external/python3/python-3.5.4-msvc-disable.patch.1 b/external/python3/python-3.5.4-msvc-disable.patch.1 new file mode 100644 index 000000000..416ab2c7b --- /dev/null +++ b/external/python3/python-3.5.4-msvc-disable.patch.1 @@ -0,0 +1,56 @@ +Disable some stuff LO does not need, especially stuff with external dependencies + +diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln +--- python3.orig/PCbuild/pcbuild.sln 2017-08-10 00:04:44.359879894 +0200 ++++ python3/PCbuild/pcbuild.sln 2017-08-10 00:13:51.179873748 +0200 +@@ -12,8 +12,6 @@ + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcxproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcxproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_decimal", "_decimal.vcxproj", "{0E9791DB-593A-465F-98BC-681011311617}" +@@ -28,32 +26,18 @@ + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcxproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcxproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcxproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testimportmultiple", "_testimportmultiple.vcxproj", "{36D0C52C-DF4E-45D0-8BC7-E294C3ABC781}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcxproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bz2", "_bz2.vcxproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcxproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_lzma", "_lzma.vcxproj", "{F9D71780-F393-11E0-BE50-0800200C9A66}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcxproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "..\PC\bdist_wininst\bdist_wininst.vcxproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcxproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcxproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" +@@ -75,8 +75,6 @@ + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_queue", "_queue.vcxproj", "{78D80A15-BD8C-44E2-B49E-1F05B0A0A687}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzma", "liblzma.vcxproj", "{12728250-16EC-4DC6-94D7-E21DD88947F8}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python_uwp", "python_uwp.vcxproj", "{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "venvlauncher", "venvlauncher.vcxproj", "{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}" diff --git a/external/python3/python-3.5.tweak.strip.soabi.patch b/external/python3/python-3.5.tweak.strip.soabi.patch new file mode 100644 index 000000000..48ac7f82f --- /dev/null +++ b/external/python3/python-3.5.tweak.strip.soabi.patch @@ -0,0 +1,12 @@ +diff -ru python3.orig/configure python3/configure +--- misc/python3.orig/configure 2015-07-26 21:14:31.127377193 +0200 ++++ misc/python3/configure 2015-07-26 21:21:34.975405648 +0200 +@@ -14388,7 +14388,7 @@ + $as_echo "$ABIFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5 + $as_echo_n "checking SOABI... " >&6; } +-SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET} ++SOABI='cpython-'`echo $VERSION$ABIFLAGS` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5 + $as_echo "$SOABI" >&6; } + diff --git a/external/python3/python-3.7.6-msvc-ssl.patch.1 b/external/python3/python-3.7.6-msvc-ssl.patch.1 new file mode 100644 index 000000000..e8e94f674 --- /dev/null +++ b/external/python3/python-3.7.6-msvc-ssl.patch.1 @@ -0,0 +1,40 @@ +No use for applink.c OPENSSL_Applink, everything is compiled with the same MSVC + +--- python3/PCbuild/_ssl.vcxproj.orig2 2019-12-23 15:54:19.254298900 +0100 ++++ python3/PCbuild/_ssl.vcxproj 2019-12-23 15:54:24.693251200 +0100 +@@ -67,9 +67,6 @@ + </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\Modules\_ssl.c" />
+- <ClCompile Include="$(opensslIncludeDir)\applink.c">
+- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions)</PreprocessorDefinitions>
+- </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\PC\python_nt.rc" />
+--- python3/PCbuild/openssl.props.orig 2019-12-23 16:20:34.588135900 +0100 ++++ python3/PCbuild/openssl.props 2019-12-23 16:20:51.074001300 +0100 +@@ -6,7 +6,7 @@ + </ClCompile>
+ <Link>
+ <AdditionalLibraryDirectories>$(opensslOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+- <AdditionalDependencies>ws2_32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <PropertyGroup>
+@@ -15,10 +15,10 @@ + <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
+ </PropertyGroup>
+ <ItemGroup>
+- <_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" />
+- <_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).pdb" />
+- <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).dll" />
+- <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).pdb" />
++ <_SSLDLL Include="$(opensslOutDir)\libeay32.dll" />
++ <_SSLDLL Include="$(opensslOutDir)\libeay32.pdb" />
++ <_SSLDLL Include="$(opensslOutDir)\ssleay32.dll" />
++ <_SSLDLL Include="$(opensslOutDir)\ssleay32.pdb" />
+ </ItemGroup>
+ <Target Name="_CopySSLDLL" Inputs="@(_SSLDLL)" Outputs="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build">
+ <Copy SourceFiles="@(_SSLDLL)" DestinationFolder="$(OutDir)" />
diff --git a/external/python3/ubsan.patch.0 b/external/python3/ubsan.patch.0 new file mode 100644 index 000000000..938acc1f1 --- /dev/null +++ b/external/python3/ubsan.patch.0 @@ -0,0 +1,20 @@ +--- Modules/_ctypes/libffi_osx/x86/x86-ffi64.c ++++ Modules/_ctypes/libffi_osx/x86/x86-ffi64.c +@@ -599,9 +599,15 @@ + tramp = (volatile unsigned short*)&closure->tramp[0]; + + tramp[0] = 0xbb49; /* mov <code>, %r11 */ +- *(void* volatile*)&tramp[1] = ffi_closure_unix64; ++ tramp[1] = (unsigned short) ffi_closure_unix64; ++ tramp[2] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 16); ++ tramp[3] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 32); ++ tramp[4] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 48); + tramp[5] = 0xba49; /* mov <data>, %r10 */ +- *(void* volatile*)&tramp[6] = closure; ++ tramp[6] = (unsigned short) closure; ++ tramp[7] = (unsigned short) (((unsigned long)closure) >> 16); ++ tramp[8] = (unsigned short) (((unsigned long)closure) >> 32); ++ tramp[9] = (unsigned short) (((unsigned long)closure) >> 48); + + /* Set the carry bit if the function uses any sse registers. + This is clc or stc, together with the first byte of the jmp. */ diff --git a/external/qrcodegen/Makefile b/external/qrcodegen/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/qrcodegen/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/qrcodegen/Module_qrcodegen.mk b/external/qrcodegen/Module_qrcodegen.mk new file mode 100644 index 000000000..09c771d0d --- /dev/null +++ b/external/qrcodegen/Module_qrcodegen.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_Module_Module,qrcodegen)) + +$(eval $(call gb_Module_add_targets,qrcodegen,\ + UnpackedTarball_qrcodegen \ +)) + +ifeq ($(ENABLE_QRCODEGEN),TRUE) + +$(eval $(call gb_Module_add_targets,qrcodegen,\ + StaticLibrary_qrcodegen \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/qrcodegen/README b/external/qrcodegen/README new file mode 100644 index 000000000..d6f19abdc --- /dev/null +++ b/external/qrcodegen/README @@ -0,0 +1,3 @@ +QR code generating library, available from [https://github.com/nayuki/QR-Code-generator/tree/master/cpp]. + +qrcodegenerator to make the QR code out of a link or text in libreoffice. diff --git a/external/qrcodegen/StaticLibrary_qrcodegen.mk b/external/qrcodegen/StaticLibrary_qrcodegen.mk new file mode 100644 index 000000000..d4b21673b --- /dev/null +++ b/external/qrcodegen/StaticLibrary_qrcodegen.mk @@ -0,0 +1,26 @@ +# -*- 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_StaticLibrary_StaticLibrary,qrcodegen)) + +$(eval $(call gb_StaticLibrary_use_unpacked,qrcodegen,qrcodegen)) + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,qrcodegen,cpp)) + +$(eval $(call gb_StaticLibrary_use_external,qrcodegen,icu_headers)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,qrcodegen)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,qrcodegen,\ + UnpackedTarball/qrcodegen/cpp/BitBuffer \ + UnpackedTarball/qrcodegen/cpp/QrCode \ + UnpackedTarball/qrcodegen/cpp/QrSegment \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/qrcodegen/UnpackedTarball_qrcodegen.mk b/external/qrcodegen/UnpackedTarball_qrcodegen.mk new file mode 100644 index 000000000..1ddbc5bc5 --- /dev/null +++ b/external/qrcodegen/UnpackedTarball_qrcodegen.mk @@ -0,0 +1,19 @@ +#-*- 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,qrcodegen)) + +$(eval $(call gb_UnpackedTarball_set_tarball,qrcodegen,$(QRCODEGEN_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,qrcodegen,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,qrcodegen, \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalPackage_raptor.mk b/external/redland/ExternalPackage_raptor.mk new file mode 100644 index 000000000..119e52f9e --- /dev/null +++ b/external/redland/ExternalPackage_raptor.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,raptor,raptor)) + +$(eval $(call gb_ExternalPackage_use_external_project,raptor,raptor)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2-lo.$(RAPTOR_MAJOR).dylib,src/.libs/libraptor2-lo.$(RAPTOR_MAJOR).dylib)) +else ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2.dll,src/.libs/libraptor2.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2-lo.so.$(RAPTOR_MAJOR),src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalPackage_rasqal.mk b/external/redland/ExternalPackage_rasqal.mk new file mode 100644 index 000000000..57fe97c38 --- /dev/null +++ b/external/redland/ExternalPackage_rasqal.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,rasqal,rasqal)) + +$(eval $(call gb_ExternalPackage_use_external_project,rasqal,rasqal)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal-lo.$(RASQAL_MAJOR).dylib,src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib)) +else ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal.dll,src/.libs/librasqal.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal-lo.so.$(RASQAL_MAJOR),src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalPackage_redland.mk b/external/redland/ExternalPackage_redland.mk new file mode 100644 index 000000000..8c35d850e --- /dev/null +++ b/external/redland/ExternalPackage_redland.mk @@ -0,0 +1,22 @@ +# -*- 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_ExternalPackage_ExternalPackage,redland,redland)) + +$(eval $(call gb_ExternalPackage_use_external_project,redland,redland)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf-lo.$(REDLAND_MAJOR).dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib)) +else ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf.dll,src/.libs/librdf.dll)) +else ifeq ($(DISABLE_DYNLOADING),) +$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf-lo.so.$(REDLAND_MAJOR),src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk new file mode 100644 index 000000000..4bc91c375 --- /dev/null +++ b/external/redland/ExternalProject_raptor.mk @@ -0,0 +1,45 @@ +# -*- 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,raptor)) + +$(eval $(call gb_ExternalProject_use_external,raptor,libxml2)) + +$(eval $(call gb_ExternalProject_register_targets,raptor,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,raptor,build): + $(call gb_Trace_StartRange,raptor,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(if $(filter iOS,$(OS)),LIBS="-liconv") \ + CFLAGS="$(CFLAGS) $(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \ + $(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \ + LDFLAGS=" \ + $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \ + $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ + CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ + ./configure --disable-gtk-doc \ + --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ + --with-www=xml \ + --without-xslt-config \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + $(if $(SYSTEM_LIBXML),$(if $(filter-out MACOSX,$(OS)),--without-xml2-config),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,raptor,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk new file mode 100644 index 000000000..0e765e098 --- /dev/null +++ b/external/redland/ExternalProject_rasqal.mk @@ -0,0 +1,54 @@ +# -*- 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,rasqal)) + +$(eval $(call gb_ExternalProject_use_external,rasqal,libxml2)) + +$(eval $(call gb_ExternalProject_use_package,rasqal,raptor)) + +$(eval $(call gb_ExternalProject_register_targets,rasqal,\ + build \ +)) + +# note: this can intentionally only build against internal raptor (not system) + +$(call gb_ExternalProject_get_state_target,rasqal,build): + $(call gb_Trace_StartRange,rasqal,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + LDFLAGS=" \ + $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \ + $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ + $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \ + PKG_CONFIG="" \ + RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ + RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2" \ + ./configure --disable-gtk-doc \ + --with-regex-library=posix \ + --with-decimal=none \ + --with-uuid-library=internal \ + --with-digest-library=internal \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),&& $(PERL) \ + $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \ + ) + $(call gb_Trace_EndRange,rasqal,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk new file mode 100644 index 000000000..f6101f0d2 --- /dev/null +++ b/external/redland/ExternalProject_redland.mk @@ -0,0 +1,57 @@ +# -*- 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,redland)) + +$(eval $(call gb_ExternalProject_use_packages,redland, \ + raptor \ + rasqal \ +)) + +$(eval $(call gb_ExternalProject_register_targets,redland,\ + build \ +)) + +# note: this can intentionally only build against internal raptor/rasqal + +$(call gb_ExternalProject_get_state_target,redland,build): + $(call gb_Trace_StartRange,redland,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + LDFLAGS=" \ + $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \ + $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ + CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ + PKG_CONFIG="" \ + RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ + RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 $(LIBXML_LIBS)" \ + RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \ + RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \ + ./configure --disable-gtk-doc \ + --disable-modular \ + --without-threads \ + --without-bdb --without-sqlite --without-mysql \ + --without-postgresql --without-threestone --without-virtuoso \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(ENABLE_DEBUG),--enable-debug) \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),&& $(PERL) \ + $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \ + ) + $(call gb_Trace_EndRange,redland,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/Library_raptor.mk b/external/redland/Library_raptor.mk new file mode 100644 index 000000000..b2779f7de --- /dev/null +++ b/external/redland/Library_raptor.mk @@ -0,0 +1,88 @@ +# -*- 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_Library_Library,raptor2)) + +$(eval $(call gb_Library_set_include,raptor2, \ + -I$(call gb_UnpackedTarball_get_dir,raptor)/src \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_use_unpacked,raptor2,raptor)) + +$(eval $(call gb_Library_use_externals,raptor2,\ + libxml2 \ + libxslt \ +)) + +$(eval $(call gb_Library_set_warnings_disabled,raptor2)) + +$(eval $(call gb_Library_add_defs,raptor2,\ + -DHAVE_CONFIG_H \ + -DRAPTOR_INTERNAL \ + -DWIN32 \ + -DNDEBUG \ + -D_WINDOWS \ + -D_USRDLL \ + -DWIN32_EXPORTS \ + -DYY_NO_UNISTD_H \ + -DHAVE__ACCESS \ + -UHAVE_ACCESS \ +)) + +$(eval $(call gb_Library_add_generated_cobjects,raptor2,\ + UnpackedTarball/raptor/src/ntriples_parse \ + UnpackedTarball/raptor/src/parsedate \ + UnpackedTarball/raptor/src/raptor_abbrev \ + UnpackedTarball/raptor/src/raptor_avltree \ + UnpackedTarball/raptor/src/raptor_concepts \ + UnpackedTarball/raptor/src/raptor_escaped \ + UnpackedTarball/raptor/src/raptor_general \ + UnpackedTarball/raptor/src/raptor_guess \ + UnpackedTarball/raptor/src/raptor_iostream \ + UnpackedTarball/raptor/src/raptor_json_writer \ + UnpackedTarball/raptor/src/raptor_libxml \ + UnpackedTarball/raptor/src/raptor_locator \ + UnpackedTarball/raptor/src/raptor_log \ + UnpackedTarball/raptor/src/raptor_memstr \ + UnpackedTarball/raptor/src/raptor_namespace \ + UnpackedTarball/raptor/src/raptor_ntriples \ + UnpackedTarball/raptor/src/raptor_option \ + UnpackedTarball/raptor/src/raptor_parse \ + UnpackedTarball/raptor/src/raptor_qname \ + UnpackedTarball/raptor/src/raptor_rdfxml \ + UnpackedTarball/raptor/src/raptor_rfc2396 \ + UnpackedTarball/raptor/src/raptor_sax2 \ + UnpackedTarball/raptor/src/raptor_sequence \ + UnpackedTarball/raptor/src/raptor_serialize \ + UnpackedTarball/raptor/src/raptor_serialize_ntriples \ + UnpackedTarball/raptor/src/raptor_serialize_rdfxml \ + UnpackedTarball/raptor/src/raptor_serialize_rdfxmla \ + UnpackedTarball/raptor/src/raptor_serialize_turtle \ + UnpackedTarball/raptor/src/raptor_set \ + UnpackedTarball/raptor/src/raptor_statement \ + UnpackedTarball/raptor/src/raptor_stringbuffer \ + UnpackedTarball/raptor/src/raptor_syntax_description \ + UnpackedTarball/raptor/src/raptor_term \ + UnpackedTarball/raptor/src/raptor_turtle_writer \ + UnpackedTarball/raptor/src/raptor_unicode \ + UnpackedTarball/raptor/src/raptor_uri \ + UnpackedTarball/raptor/src/raptor_www \ + UnpackedTarball/raptor/src/raptor_xml \ + UnpackedTarball/raptor/src/raptor_xml_writer \ + UnpackedTarball/raptor/src/snprintf \ + UnpackedTarball/raptor/src/sort_r \ + UnpackedTarball/raptor/src/strcasecmp \ + UnpackedTarball/raptor/src/turtle_common \ + UnpackedTarball/raptor/src/turtle_lexer \ + UnpackedTarball/raptor/src/turtle_parser \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/Library_rasqal.mk b/external/redland/Library_rasqal.mk new file mode 100644 index 000000000..79171d904 --- /dev/null +++ b/external/redland/Library_rasqal.mk @@ -0,0 +1,127 @@ +# -*- 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_Library_Library,rasqal)) + +$(eval $(call gb_Library_use_unpacked,rasqal,rasqal)) + +$(eval $(call gb_Library_set_warnings_disabled,rasqal)) + +$(eval $(call gb_Library_use_external,rasqal,raptor_headers)) + +$(eval $(call gb_Library_use_libraries,rasqal,raptor2)) + +$(eval $(call gb_Library_add_defs,rasqal,\ + -DSV_CONFIG \ + -DRASQAL_INTERNAL \ + -DWIN32 \ + -DNDEBUG \ + -D_WINDOWS \ + -D_USRDLL \ + -DWIN32_EXPORTS \ + -D_MT \ + -DHAVE_STDLIB_H \ + -DHAVE_STDINT_H \ + -DHAVE_TIME_H \ + -DHAVE_MATH_H \ + -DHAVE_FLOAT_H \ + -DHAVE___FUNCTION__ \ +)) + +$(eval $(call gb_Library_set_include,rasqal,\ + -I$(call gb_UnpackedTarball_get_dir,rasqal)/libmtwist \ + -I$(call gb_UnpackedTarball_get_dir,rasqal)/libsv \ + -I$(call gb_UnpackedTarball_get_dir,rasqal)/src \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_generated_cobjects,rasqal,\ + UnpackedTarball/rasqal/libmtwist/mt \ + UnpackedTarball/rasqal/libmtwist/seed \ + UnpackedTarball/rasqal/libsv/sv \ + UnpackedTarball/rasqal/src/rasqal_algebra \ + UnpackedTarball/rasqal/src/rasqal_bindings \ + UnpackedTarball/rasqal/src/rasqal_data_graph \ + UnpackedTarball/rasqal/src/rasqal_dataset \ + UnpackedTarball/rasqal/src/rasqal_datetime \ + UnpackedTarball/rasqal/src/rasqal_decimal \ + UnpackedTarball/rasqal/src/rasqal_digest \ + UnpackedTarball/rasqal/src/rasqal_digest_md5 \ + UnpackedTarball/rasqal/src/rasqal_digest_sha1 \ + UnpackedTarball/rasqal/src/rasqal_double \ + UnpackedTarball/rasqal/src/rasqal_engine \ + UnpackedTarball/rasqal/src/rasqal_engine_algebra \ + UnpackedTarball/rasqal/src/rasqal_engine_sort \ + UnpackedTarball/rasqal/src/rasqal_expr \ + UnpackedTarball/rasqal/src/rasqal_expr_datetimes \ + UnpackedTarball/rasqal/src/rasqal_expr_evaluate \ + UnpackedTarball/rasqal/src/rasqal_expr_numerics \ + UnpackedTarball/rasqal/src/rasqal_expr_strings \ + UnpackedTarball/rasqal/src/rasqal_feature \ + UnpackedTarball/rasqal/src/rasqal_format_html \ + UnpackedTarball/rasqal/src/rasqal_format_json \ + UnpackedTarball/rasqal/src/rasqal_format_rdf \ + UnpackedTarball/rasqal/src/rasqal_format_sparql_xml \ + UnpackedTarball/rasqal/src/rasqal_format_sv \ + UnpackedTarball/rasqal/src/rasqal_format_table \ + UnpackedTarball/rasqal/src/rasqal_formula \ + UnpackedTarball/rasqal/src/rasqal_general \ + UnpackedTarball/rasqal/src/rasqal_graph_pattern \ + UnpackedTarball/rasqal/src/rasqal_iostream \ + UnpackedTarball/rasqal/src/rasqal_literal \ + UnpackedTarball/rasqal/src/rasqal_map \ + UnpackedTarball/rasqal/src/rasqal_ntriples \ + UnpackedTarball/rasqal/src/rasqal_prefix \ + UnpackedTarball/rasqal/src/rasqal_projection \ + UnpackedTarball/rasqal/src/rasqal_query \ + UnpackedTarball/rasqal/src/rasqal_query_results \ + UnpackedTarball/rasqal/src/rasqal_query_transform \ + UnpackedTarball/rasqal/src/rasqal_query_write \ + UnpackedTarball/rasqal/src/rasqal_random \ + UnpackedTarball/rasqal/src/rasqal_raptor \ + UnpackedTarball/rasqal/src/rasqal_regex \ + UnpackedTarball/rasqal/src/rasqal_result_formats \ + UnpackedTarball/rasqal/src/rasqal_results_compare \ + UnpackedTarball/rasqal/src/rasqal_row \ + UnpackedTarball/rasqal/src/rasqal_row_compatible \ + UnpackedTarball/rasqal/src/rasqal_rowsource \ + UnpackedTarball/rasqal/src/rasqal_rowsource_aggregation \ + UnpackedTarball/rasqal/src/rasqal_rowsource_assignment \ + UnpackedTarball/rasqal/src/rasqal_rowsource_bindings \ + UnpackedTarball/rasqal/src/rasqal_rowsource_distinct \ + UnpackedTarball/rasqal/src/rasqal_rowsource_empty \ + UnpackedTarball/rasqal/src/rasqal_rowsource_filter \ + UnpackedTarball/rasqal/src/rasqal_rowsource_graph \ + UnpackedTarball/rasqal/src/rasqal_rowsource_groupby \ + UnpackedTarball/rasqal/src/rasqal_rowsource_having \ + UnpackedTarball/rasqal/src/rasqal_rowsource_join \ + UnpackedTarball/rasqal/src/rasqal_rowsource_project \ + UnpackedTarball/rasqal/src/rasqal_rowsource_rowsequence \ + UnpackedTarball/rasqal/src/rasqal_rowsource_service \ + UnpackedTarball/rasqal/src/rasqal_rowsource_slice \ + UnpackedTarball/rasqal/src/rasqal_rowsource_sort \ + UnpackedTarball/rasqal/src/rasqal_rowsource_triples \ + UnpackedTarball/rasqal/src/rasqal_rowsource_union \ + UnpackedTarball/rasqal/src/rasqal_service \ + UnpackedTarball/rasqal/src/rasqal_solution_modifier \ + UnpackedTarball/rasqal/src/rasqal_sort \ + UnpackedTarball/rasqal/src/rasqal_triple \ + UnpackedTarball/rasqal/src/rasqal_triples_source \ + UnpackedTarball/rasqal/src/rasqal_update \ + UnpackedTarball/rasqal/src/rasqal_variable \ + UnpackedTarball/rasqal/src/rasqal_xsd_datatypes \ + UnpackedTarball/rasqal/src/snprintf \ + UnpackedTarball/rasqal/src/sparql_lexer \ + UnpackedTarball/rasqal/src/sparql_parser \ + UnpackedTarball/rasqal/src/timegm \ + UnpackedTarball/rasqal/src/gettimeofday \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/Library_rdf.mk b/external/redland/Library_rdf.mk new file mode 100644 index 000000000..cc427b339 --- /dev/null +++ b/external/redland/Library_rdf.mk @@ -0,0 +1,78 @@ +# -*- 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_Library_Library,rdf)) + +$(eval $(call gb_Library_set_include,rdf, \ + -I$(call gb_UnpackedTarball_get_dir,redland)/src \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_use_unpacked,rdf,redland)) + +$(eval $(call gb_Library_set_warnings_disabled,rdf)) + +$(eval $(call gb_Library_use_libraries,rdf,\ + raptor2 \ + rasqal \ +)) + +$(eval $(call gb_Library_use_externals,rdf,\ + raptor_headers \ + rasqal_headers \ +)) + +$(eval $(call gb_Library_add_defs,rdf,\ + -DLIBRDF_INTERNAL \ + -DWIN32 \ + -DNDEBUG \ + -D_WINDOWS \ + -D_USRDLL \ + -DWIN32_EXPORTS \ +)) + +$(eval $(call gb_Library_add_generated_cobjects,rdf,\ + UnpackedTarball/redland/src/rdf_concepts \ + UnpackedTarball/redland/src/rdf_digest \ + UnpackedTarball/redland/src/rdf_digest_md5 \ + UnpackedTarball/redland/src/rdf_digest_sha1 \ + UnpackedTarball/redland/src/rdf_files \ + UnpackedTarball/redland/src/rdf_hash \ + UnpackedTarball/redland/src/rdf_hash_cursor \ + UnpackedTarball/redland/src/rdf_hash_memory \ + UnpackedTarball/redland/src/rdf_heuristics \ + UnpackedTarball/redland/src/rdf_init \ + UnpackedTarball/redland/src/rdf_iterator \ + UnpackedTarball/redland/src/rdf_list \ + UnpackedTarball/redland/src/rdf_log \ + UnpackedTarball/redland/src/rdf_model \ + UnpackedTarball/redland/src/rdf_model_storage \ + UnpackedTarball/redland/src/rdf_node \ + UnpackedTarball/redland/src/rdf_node_common \ + UnpackedTarball/redland/src/rdf_parser \ + UnpackedTarball/redland/src/rdf_parser_raptor \ + UnpackedTarball/redland/src/rdf_raptor \ + UnpackedTarball/redland/src/rdf_query \ + UnpackedTarball/redland/src/rdf_query_rasqal \ + UnpackedTarball/redland/src/rdf_query_results \ + UnpackedTarball/redland/src/rdf_serializer \ + UnpackedTarball/redland/src/rdf_serializer_raptor \ + UnpackedTarball/redland/src/rdf_statement \ + UnpackedTarball/redland/src/rdf_statement_common \ + UnpackedTarball/redland/src/rdf_storage \ + UnpackedTarball/redland/src/rdf_storage_file \ + UnpackedTarball/redland/src/rdf_storage_list \ + UnpackedTarball/redland/src/rdf_storage_hashes \ + UnpackedTarball/redland/src/rdf_storage_trees \ + UnpackedTarball/redland/src/rdf_stream \ + UnpackedTarball/redland/src/rdf_uri \ + UnpackedTarball/redland/src/rdf_utf8 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/Makefile b/external/redland/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/redland/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/redland/Module_redland.mk b/external/redland/Module_redland.mk new file mode 100644 index 000000000..adc81b462 --- /dev/null +++ b/external/redland/Module_redland.mk @@ -0,0 +1,34 @@ +# -*- 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,redland)) + +$(eval $(call gb_Module_add_targets,redland,\ + UnpackedTarball_raptor \ + UnpackedTarball_rasqal \ + UnpackedTarball_redland \ +)) +ifeq ($(COM),MSC) +$(eval $(call gb_Module_add_targets,redland,\ + Library_raptor \ + Library_rasqal \ + Library_rdf \ +)) +else +$(eval $(call gb_Module_add_targets,redland,\ + ExternalPackage_raptor \ + ExternalPackage_rasqal \ + ExternalPackage_redland \ + ExternalProject_raptor \ + ExternalProject_rasqal \ + ExternalProject_redland \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/README b/external/redland/README new file mode 100644 index 000000000..591e93398 --- /dev/null +++ b/external/redland/README @@ -0,0 +1,24 @@ +Redland RDF library (librdf) from [http://librdf.org/] + +== License == +[git:redland/LICENSE.txt] +Triple-licensed: LGPL v2+/GPL v2+/Apache v2 + +== Description == +This module contains the third-party Redland RDF / librdf library, which +is needed to support data in RDF (Resource Description Framework) format. +It consists of 3 parts: +- raptor: parsers and serializers for numerous RDF file formats +- rasqal: query engine which supports SPARQL queries +- redland: librdf integrates raptor and rasqal, and provides numerous storage + engines for storing RDF graphs (in memory, SQL, ...) + +Libraries: libraptor, librasqal, librdf + +== Patches == +There are several patches, most of which contain only hacks to get it to +build with the LO build system. + +Upstream may merge patches that are attached to the bug tracker, but don't +send patches to the mailing list, those will most likely be ignored. + diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk new file mode 100644 index 000000000..fbdc8b6f5 --- /dev/null +++ b/external/redland/UnpackedTarball_raptor.mk @@ -0,0 +1,35 @@ +# -*- 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,raptor)) + +$(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL),,redland)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,raptor,build)) + +# configure generated files for MSVC +$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,external/redland/raptor/raptor2.h)) +$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,external/redland/raptor/raptor_config.h)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,raptor,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,raptor,\ + external/redland/raptor/raptor-freebsd.patch.1 \ + external/redland/raptor/raptor-msvc.patch.1 \ + $(if $(filter-out WNT,$(OS)),external/redland/raptor/raptor-bundled-soname.patch.1) \ + $(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \ + external/redland/raptor/ubsan.patch \ + $(if $(SYSTEM_LIBXML),,external/redland/raptor/rpath.patch) \ + external/redland/raptor/xml2-config.patch \ + external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 \ + external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 \ + external/redland/raptor/libtool.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/UnpackedTarball_rasqal.mk b/external/redland/UnpackedTarball_rasqal.mk new file mode 100644 index 000000000..bb44f39a6 --- /dev/null +++ b/external/redland/UnpackedTarball_rasqal.mk @@ -0,0 +1,34 @@ +# -*- 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,rasqal)) + +$(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL),,redland)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,rasqal,build)) + +# configure generated files for MSVC +$(eval $(call gb_UnpackedTarball_add_file,rasqal,src/rasqal.h,external/redland/rasqal/rasqal.h)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,rasqal,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,rasqal,\ + external/redland/rasqal/rasqal-pkgconfig.patch.1 \ + external/redland/rasqal/rasqal-freebsd.patch.1 \ + external/redland/rasqal/rasqal-msvc.patch.1 \ + external/redland/rasqal/rasqal-aix.patch.1 \ + $(if $(filter-out WNT,$(OS)),external/redland/rasqal/rasqal-bundled-soname.patch.1) \ + $(if $(filter ANDROID,$(OS)),external/redland/rasqal/rasqal-android.patch.1) \ + $(if $(CROSS_COMPILING),external/redland/rasqal/rasqal-xcompile.patch.1) \ + external/redland/rasqal/rpath.patch \ + external/redland/rasqal/clang-cl.patch \ + external/redland/rasqal/libtool.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/UnpackedTarball_redland.mk b/external/redland/UnpackedTarball_redland.mk new file mode 100644 index 000000000..66e766d20 --- /dev/null +++ b/external/redland/UnpackedTarball_redland.mk @@ -0,0 +1,38 @@ +# -*- 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,redland)) + +$(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL),,redland)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,redland,\ + build \ + libltdl/config \ +)) + +# configure generated files for MSVC +$(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,external/redland/redland/librdf.h)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,redland,0)) + +# redland-format.patch.0 sent upstream as +# <https://github.com/dajobe/librdf/pull/6> +$(eval $(call gb_UnpackedTarball_add_patches,redland,\ + external/redland/redland/redland-freebsd.patch.1 \ + external/redland/redland/redland-msvc.patch.1 \ + $(if $(filter-out WNT,$(OS)),external/redland/redland/redland-bundled-soname.patch.1) \ + $(if $(filter ANDROID,$(OS)),external/redland/redland/redland-android.patch.1) \ + $(if $(CROSS_COMPILING),external/redland/redland/redland-xcompile.patch.1) \ + external/redland/redland/redland-format.patch.0 \ + external/redland/redland/rpath.patch \ + external/redland/redland/clang-cl.patch \ + external/redland/redland/libtool.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 b/external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 new file mode 100644 index 000000000..1fb279df3 --- /dev/null +++ b/external/redland/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 @@ -0,0 +1,33 @@ +From a549457461874157c8c8e8e8a6e0eec06da4fbd0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Tue, 24 Nov 2020 10:30:20 +0000 +Subject: [PATCH] CVE-2020-25713 raptor2: malformed input file can lead to a + segfault + +due to an out of bounds array access in +raptor_xml_writer_start_element_common + +See: +https://bugs.mageia.org/show_bug.cgi?id=27605 +https://www.openwall.com/lists/oss-security/2020/11/13/1 +https://gerrit.libreoffice.org/c/core/+/106249 +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } +-- +2.28.0 + diff --git a/external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 b/external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 new file mode 100644 index 000000000..6fa726cae --- /dev/null +++ b/external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 @@ -0,0 +1,43 @@ +From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001 +From: Dave Beckett <dave@dajobe.org> +Date: Sun, 16 Apr 2017 23:15:12 +0100 +Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer + +(raptor_xml_writer_start_element_common): Calculate max including for +each attribute a potential name and value. + +Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617 +and #0000618 http://bugs.librdf.org/mantis/view.php?id=618 +--- + src/raptor_xml_writer.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 693b946..0d3a36a 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + size_t nspace_declarations_count = 0; + unsigned int i; + +- /* max is 1 per element and 1 for each attribute + size of declared */ + if(nstack) { +- int nspace_max_count = element->attribute_count+1; ++ int nspace_max_count = element->attribute_count * 2; /* attr and value */ ++ if(element->name->nspace) ++ nspace_max_count++; + if(element->declared_nspaces) + nspace_max_count += raptor_sequence_size(element->declared_nspaces); + if(element->xml_language) +@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + } + } + +- /* Add the attribute + value */ ++ /* Add the attribute's value */ + nspace_declarations[nspace_declarations_count].declaration= + raptor_qname_format_as_xml(element->attributes[i], + &nspace_declarations[nspace_declarations_count].length); +-- +2.9.3 + diff --git a/external/redland/raptor/libtool.patch b/external/redland/raptor/libtool.patch new file mode 100644 index 000000000..b0baae661 --- /dev/null +++ b/external/redland/raptor/libtool.patch @@ -0,0 +1,27 @@ +--- build/ltmain.sh ++++ build/ltmain.sh +@@ -5301,6 +5301,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -5639,6 +5645,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/external/redland/raptor/raptor-android.patch.1 b/external/redland/raptor/raptor-android.patch.1 new file mode 100644 index 000000000..cb843839c --- /dev/null +++ b/external/redland/raptor/raptor-android.patch.1 @@ -0,0 +1,13 @@ +No sonames on Android + +--- a/configure 2013-03-29 19:46:34.922901756 +0100 ++++ b/configure 2013-03-29 19:46:56.051901574 +0100 +@@ -9866,7 +9866,7 @@ + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac +- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ diff --git a/external/redland/raptor/raptor-bundled-soname.patch.1 b/external/redland/raptor/raptor-bundled-soname.patch.1 new file mode 100644 index 000000000..cce2482d1 --- /dev/null +++ b/external/redland/raptor/raptor-bundled-soname.patch.1 @@ -0,0 +1,13 @@ +rhbz#809466 change soname of bundled redland libs + +--- a/src/Makefile.in 2013-03-29 19:11:27.944919859 +0100 ++++ b/src/Makefile.in 2013-03-29 19:17:42.173916644 +0100 +@@ -507,7 +507,7 @@ + $(am__append_21) $(am__append_22) $(am__append_23) \ + $(am__append_24) $(am__append_25) $(am__append_26) + libraptor2_la_LIBADD = $(am__append_29) @LTLIBOBJS@ +-libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ \ ++libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo \ + @RAPTOR_LDFLAGS@ $(MEM_LIBS) + + EXTRA_DIST = \ diff --git a/external/redland/raptor/raptor-freebsd.patch.1 b/external/redland/raptor/raptor-freebsd.patch.1 new file mode 100644 index 000000000..349f3a197 --- /dev/null +++ b/external/redland/raptor/raptor-freebsd.patch.1 @@ -0,0 +1,28 @@ +Usual patch to produce Linux-like .so files on FreeBSD + +--- a/build/ltmain.sh 2008-02-02 22:28:24.000000000 +0900 ++++ b/build/ltmain.sh 2008-07-08 11:58:42.000000000 +0900 +@@ -7341,9 +7341,9 @@ + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|qnx|sunos) +- current="$number_major" +- revision="$number_minor" +- age="0" ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor +@@ -7420,8 +7420,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current" ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" + ;; + + irix | nonstopux) diff --git a/external/redland/raptor/raptor-msvc.patch.1 b/external/redland/raptor/raptor-msvc.patch.1 new file mode 100644 index 000000000..245b19bdc --- /dev/null +++ b/external/redland/raptor/raptor-msvc.patch.1 @@ -0,0 +1,23 @@ +--- raptor/src/raptor2.h.in.orig 2016-08-26 23:45:34.543400074 +0200 ++++ raptor/src/raptor2.h.in 2016-08-26 23:45:40.479399614 +0200 +@@ -2176,6 +2176,7 @@ + void* raptor_avltree_iterator_get(raptor_avltree_iterator* iterator); + + /* utility methods */ ++RAPTOR_API + void raptor_sort_r(void *base, size_t nel, size_t width, raptor_data_compare_arg_handler compar, void *user_data); + + +--- raptor/src/raptor_uri.c 2016-08-26 23:45:34.543400074 +0200 ++++ raptor/src/raptor_uri.c 2016-08-26 23:45:40.479399614 +0200 +@@ -51,6 +51,10 @@ + #include <sys/stat.h> + #endif + ++#if !defined(HAVE_ACCESS) && defined(HAVE__ACCESS) ++#include <io.h> ++#endif ++ + /* Raptor includes */ + #include "raptor2.h" + #include "raptor_internal.h" diff --git a/external/redland/raptor/raptor2.h b/external/redland/raptor/raptor2.h new file mode 100644 index 000000000..4929117e7 --- /dev/null +++ b/external/redland/raptor/raptor2.h @@ -0,0 +1,2187 @@ +/* -*- Mode: c; c-basic-offset: 2 -*- + * + * raptor.h - Redland Parser Toolkit for RDF (Raptor) - public API + * + * Copyright (C) 2000-2013, David Beckett http://www.dajobe.org/ + * Copyright (C) 2000-2005, University of Bristol, UK http://www.bristol.ac.uk/ + * + * This package is Free Software and part of Redland http://librdf.org/ + * + * It is licensed under the following three licenses as alternatives: + * 1. GNU Lesser General Public License (LGPL) V2.1 or any newer version + * 2. GNU General Public License (GPL) V2 or any newer version + * 3. Apache License, V2.0 or any newer version + * + * You may not use this file except in compliance with at least one of + * the above three licenses. + * + * See LICENSE.html or LICENSE.txt at the top of this package for the + * complete terms and further detail along with the license texts for + * the licenses in COPYING.LIB, COPYING and LICENSE-2.0.txt respectively. + * + * + */ + + + +#ifndef RAPTOR_H +#define RAPTOR_H + + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdio.h> + +/* Required for va_list in raptor_vsnprintf */ +#include <stdarg.h> + + +/** + * RAPTOR_V2_AVAILABLE + * + * Flag for marking raptor2 API availability. + */ +#define RAPTOR_V2_AVAILABLE 1 + + +/** + * RAPTOR_VERSION: + * + * Raptor library version number + * + * Format: major * 10000 + minor * 100 + release + */ +#define RAPTOR_VERSION 20015 + +/** + * RAPTOR_VERSION_STRING: + * + * Raptor library version string + */ +#define RAPTOR_VERSION_STRING "2.0.15" + +/** + * RAPTOR_VERSION_MAJOR: + * + * Raptor library major version + */ +#define RAPTOR_VERSION_MAJOR 2 + +/** + * RAPTOR_VERSION_MINOR: + * + * Raptor library minor version + */ +#define RAPTOR_VERSION_MINOR 0 + +/** + * RAPTOR_VERSION_RELEASE: + * + * Raptor library release + */ +#define RAPTOR_VERSION_RELEASE 15 + +/** + * RAPTOR_API: + * + * Macro for wrapping API function call declarations. + * + */ +#ifndef RAPTOR_API +# ifdef _WIN32 +# ifdef __GNUC__ +# undef _declspec +# define _declspec(x) __declspec(x) +# endif +# ifdef RAPTOR_STATIC +# define RAPTOR_API +# else +# ifdef RAPTOR_INTERNAL +# define RAPTOR_API _declspec(dllexport) +# else +# define RAPTOR_API _declspec(dllimport) +# endif +# endif +# else +# define RAPTOR_API +# endif +#endif + +/* Use gcc 3.1+ feature to allow marking of deprecated API calls. + * This gives a warning during compiling. + */ +#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) +#define RAPTOR_DEPRECATED __attribute__((deprecated)) +#define RAPTOR_NORETURN __attribute__((__noreturn__)) +#else +#define RAPTOR_DEPRECATED +#define RAPTOR_NORETURN +#endif + +/** + * RAPTOR_PRINTF_FORMAT: + * @string_index: ignore me + * @first_to_check_index: ignore me + * + * Internal macro + */ +#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)) +#define RAPTOR_PRINTF_FORMAT(string_index, first_to_check_index) \ + __attribute__((__format__(__printf__, string_index, first_to_check_index))) +#else +#define RAPTOR_PRINTF_FORMAT(string_index, first_to_check_index) +#endif + +/** + * raptor_uri: + * + * Raptor URI Class. + */ +typedef struct raptor_uri_s raptor_uri; + + +/* Public statics */ + +/** + * raptor_short_copyright_string: + * + * Short copyright string (one line). + */ +RAPTOR_API +extern const char * const raptor_short_copyright_string; + +/** + * raptor_copyright_string: + * + * Copyright string (multiple lines). + */ +RAPTOR_API +extern const char * const raptor_copyright_string; + +/** + * raptor_version_string: + * + * Raptor version as a string. + */ +RAPTOR_API +extern const char * const raptor_version_string; + +/** + * raptor_version_major: + * + * Raptor major version number. + */ +RAPTOR_API +extern const unsigned int raptor_version_major; + +/** + * raptor_version_minor: + * + * Raptor minor version number. + */ +RAPTOR_API +extern const unsigned int raptor_version_minor; + +/** + * raptor_version_release: + * + * Raptor release version number. + */ +RAPTOR_API +extern const unsigned int raptor_version_release; + +/** + * raptor_version_decimal: + * + * Raptor version as a decimal number. + * + * Format: major * 10000 + minor * 100 + release + */ +RAPTOR_API +extern const unsigned int raptor_version_decimal; + +/** + * raptor_license_string: + * + * Raptor license string. + */ +RAPTOR_API +extern const char * const raptor_license_string; + +/** + * raptor_home_url_string: + * + * Raptor home page URL. + */ +RAPTOR_API +extern const char * const raptor_home_url_string; + +/** + * raptor_xml_namespace_uri: + * + * XML Namespace (xml:) URI string. + */ +RAPTOR_API +extern const unsigned char * const raptor_xml_namespace_uri; + + +/** + * raptor_rdf_namespace_uri: + * + * RDF Namespace (rdf:) URI string. + */ +RAPTOR_API +extern const unsigned char * const raptor_rdf_namespace_uri; + +/** + * raptor_rdf_namespace_uri_len: + * + * Length of #raptor_rdf_namespace_uri string + */ +RAPTOR_API +extern const unsigned int raptor_rdf_namespace_uri_len; + +/** + * raptor_rdf_schema_namespace_uri: + * + * RDF Schema (rdfs:) Namespace URI string. + */ +RAPTOR_API +extern const unsigned char * const raptor_rdf_schema_namespace_uri; + +/** + * raptor_xmlschema_datatypes_namespace_uri: + * + * XML Schema datatypes (xsd:) namespace URI string. + */ +RAPTOR_API +extern const unsigned char * const raptor_xmlschema_datatypes_namespace_uri; + +/** + * raptor_owl_namespace_uri: + * + * OWL (owl:) Namespace URI string. + */ +RAPTOR_API +extern const unsigned char * const raptor_owl_namespace_uri; + +/** + * raptor_xml_literal_datatype_uri_string: + * + * XML Literal datatype (rdf:XMLLiteral) URI string. + */ +RAPTOR_API +extern const unsigned char * const raptor_xml_literal_datatype_uri_string; + +/** + * raptor_xml_literal_datatype_uri_string_len: + * + * Length of #raptor_xml_literal_datatype_uri_string + */ +RAPTOR_API +extern const unsigned int raptor_xml_literal_datatype_uri_string_len; + + +/* Public structure */ +/** + * raptor_world: + * + * Raptor world class. + */ +typedef struct raptor_world_s raptor_world; +/** + * raptor_parser: + * + * Raptor Parser class + */ +typedef struct raptor_parser_s raptor_parser; +/** + * raptor_serializer: + * + * Raptor Serializer class + */ +typedef struct raptor_serializer_s raptor_serializer; + +/** + * raptor_www: + * + * Raptor WWW class + */ +typedef struct raptor_www_s raptor_www; +/** + * raptor_iostream: + * + * Raptor I/O Stream class + */ +typedef struct raptor_iostream_s raptor_iostream; +/** + * raptor_xml_element: + * + * Raptor XML Element class + */ +typedef struct raptor_xml_element_s raptor_xml_element; +/** + * raptor_xml_writer: + * + * Raptor XML Writer class + */ +typedef struct raptor_xml_writer_s raptor_xml_writer; +/** + * raptor_qname: + * + * Raptor XML qname class + */ +typedef struct raptor_qname_s raptor_qname; +/** + * raptor_namespace: + * + * Raptor XML Namespace class + */ +typedef struct raptor_namespace_s raptor_namespace; +/** + * raptor_namespace_stack: + * + * Raptor XML Namespace Stack class + */ +typedef struct raptor_namespace_stack_s raptor_namespace_stack; + +/** + * raptor_sax2: + * + * Raptor SAX2 class + */ +typedef struct raptor_sax2_s raptor_sax2; + + +/** + * raptor_type_q: + * @mime_type: MIME type string + * @mime_type_len: length of @mime_type + * @q: Q value 0-10 standing for decimal 0.0-1.0 + * + * (MIME Type, Q) pair + */ +typedef struct { + const char* mime_type; + size_t mime_type_len; + unsigned char q; +} raptor_type_q; + + +/** + * raptor_syntax_bitflags: + * @RAPTOR_SYNTAX_NEED_BASE_URI: the syntax requires a base URI + * + * Bit flags for #raptor_syntax_description flags field + */ +typedef enum { + RAPTOR_SYNTAX_NEED_BASE_URI = 1 +} raptor_syntax_bitflags; + + +/** + * raptor_syntax_description: + * @names: array of syntax names - the first one (required) is the public name, the rest are aliases. The array is NULL terminated. + * @names_count: size of @names array + * @label: long descriptive label for syntax + * @mime_types: Array of (MIME type, Q) values associated with the syntax (or NULL). If present the array is NULL terminated. + * @mime_types_count: size of @mime_types array + * @uri_strings: array of URIs identifying the syntax (or NULL). The first one if present is the main URI, the rest are aliases. The array is NULL terminated. + * @uri_strings_count: size of @uri_strings array + * @flags: See #raptor_syntax_bitflags for the bits + * + * Description of a syntax or file format. + * + */ +typedef struct { + const char* const* names; + unsigned int names_count; + + const char* label; + + const raptor_type_q* mime_types; + unsigned int mime_types_count; + + const char* const* uri_strings; + unsigned int uri_strings_count; + + unsigned int flags; +} raptor_syntax_description; + + +/** + * raptor_term_type: + * @RAPTOR_TERM_TYPE_URI: RDF URI + * @RAPTOR_TERM_TYPE_LITERAL: RDF literal + * @RAPTOR_TERM_TYPE_BLANK: RDF blank node + * @RAPTOR_TERM_TYPE_UNKNOWN: Internal + * + * Type of term in a #raptor_statement + * + * Node type 3 is unused but exists to preserve numeric compatibility + * with librdf_node_type values. + */ +typedef enum { + RAPTOR_TERM_TYPE_UNKNOWN = 0, + RAPTOR_TERM_TYPE_URI = 1, + RAPTOR_TERM_TYPE_LITERAL = 2, + /* unused type 3 */ + RAPTOR_TERM_TYPE_BLANK = 4 +} raptor_term_type; + + +/** + * raptor_locator: + * @uri: URI of location (or NULL) + * @file: Filename of location (or NULL) + * @line: Line number of location (or <0 for no line) + * @column: Column number of location (or <0 for no column) + * @byte: Byte number of location (or <0 for no byte) + * + * Location information for an error, warning or information message. + */ +typedef struct { + raptor_uri *uri; + const char *file; + int line; + int column; + int byte; +} raptor_locator; + +/** + * raptor_option: + * @RAPTOR_OPTION_SCANNING: If true (default false), the RDF/XML + * parser will look for embedded rdf:RDF elements inside the XML + * content, and not require that the XML start with an rdf:RDF root + * element. + * @RAPTOR_OPTION_ALLOW_NON_NS_ATTRIBUTES: If true (default true) + * then the RDF/XML parser will allow non-XML namespaced attributes + * to be accepted as well as rdf: namespaced ones. For example, + * 'about' and 'ID' will be interpreted as if they were rdf:about + * and rdf:ID respectively. + * @RAPTOR_OPTION_ALLOW_OTHER_PARSETYPES: If true (default true) + * then the RDF/XML parser will allow unknown parsetypes to be + * present and will pass them on to the user. Unimplemented at + * present. + * @RAPTOR_OPTION_ALLOW_BAGID: If true (default true) then the + * RDF/XML parser will support the rdf:bagID attribute that was + * removed from the RDF/XML language when it was revised. This + * support may be removed in future. + * @RAPTOR_OPTION_ALLOW_RDF_TYPE_RDF_LIST: If true (default false) + * then the RDF/XML parser will generate the idList rdf:type + * rdf:List triple in the handling of rdf:parseType="Collection". + * This triple was removed during the revising of RDF/XML after + * collections were initially added. + * @RAPTOR_OPTION_NORMALIZE_LANGUAGE: If true (default true) then + * XML language values such as from xml:lang will be normalized to + * lowercase. + * @RAPTOR_OPTION_NON_NFC_FATAL: If true (default false) then + * illegal Unicode Normal Form C in literals will give a fatal + * error, otherwise just a warning. + * @RAPTOR_OPTION_WARN_OTHER_PARSETYPES: If true (default true) then + * the RDF/XML parser will warn about unknown rdf:parseType values. + * @RAPTOR_OPTION_CHECK_RDF_ID: If true (default true) then the + * RDF/XML will check rdf:ID attribute values for duplicates and + * cause an error if any are found. + * @RAPTOR_OPTION_RELATIVE_URIS: If true (default true) then + * relative URIs will be used wherever possible when serializing. + * @RAPTOR_OPTION_WRITER_AUTO_INDENT: Automatically indent elements when + * seriailizing. + * @RAPTOR_OPTION_WRITER_AUTO_EMPTY: Automatically detect and + * abbreviate empty elements when serializing. + * @RAPTOR_OPTION_WRITER_INDENT_WIDTH: Integer number of spaces to use + * for each indent level when serializing with auto indent. + * @RAPTOR_OPTION_WRITER_XML_VERSION: Integer XML version XML 1.0 (10) or XML 1.1 (11) + * @RAPTOR_OPTION_WRITER_XML_DECLARATION: Write XML 1.0 or 1.1 declaration. + * @RAPTOR_OPTION_NO_NET: Deny network requests inside other requests. + * @RAPTOR_OPTION_RESOURCE_BORDER: Border color of resource + * nodes for GraphViz DOT serializer. + * @RAPTOR_OPTION_LITERAL_BORDER: Border color of literal nodes + * for GraphViz DOT serializer. + * @RAPTOR_OPTION_BNODE_BORDER: Border color of blank nodes for + * GraphViz DOT serializer. + * @RAPTOR_OPTION_RESOURCE_FILL: Fill color of resource nodes + * for GraphViz DOT serializer. + * @RAPTOR_OPTION_LITERAL_FILL: Fill color of literal nodes for + * GraphViz DOT serializer. + * @RAPTOR_OPTION_BNODE_FILL: Fill color of blank nodes for + * GraphViz DOT serializer. + * @RAPTOR_OPTION_HTML_TAG_SOUP: Use a lax HTML parser if an XML parser + * fails when read HTML for GRDDL parser. + * @RAPTOR_OPTION_MICROFORMATS: Look for microformats for GRDDL parser. + * @RAPTOR_OPTION_HTML_LINK: Look for head <link> to type rdf/xml + * for GRDDL parser. + * @RAPTOR_OPTION_WWW_TIMEOUT: Set timeout for internal WWW URI requests + * for GRDDL parser. + * @RAPTOR_OPTION_WRITE_BASE_URI: Write @base directive for Turtle/N3. + * @RAPTOR_OPTION_WWW_HTTP_CACHE_CONTROL: HTTP Cache-Control: header + * @RAPTOR_OPTION_WWW_HTTP_USER_AGENT: HTTP User-Agent: header + * @RAPTOR_OPTION_JSON_CALLBACK: JSON serializer callback function. + * @RAPTOR_OPTION_JSON_EXTRA_DATA: JSON serializer extra top-level data + * @RAPTOR_OPTION_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples it finds (none, rdf-xml, atom-triples) + * @RAPTOR_OPTION_ATOM_ENTRY_URI: Atom entry URI. If given, generate an Atom Entry Document with the item having the given URI, otherwise generate an Atom Feed Document with any items found. + * @RAPTOR_OPTION_PREFIX_ELEMENTS: Integer. If set, generate Atom/RSS1.0 documents with prefixed elements, otherwise unprefixed. + * @RAPTOR_OPTION_STRICT: Boolean. If set, operate in strict conformance mode. + * @RAPTOR_OPTION_WWW_CERT_FILENAME: String. SSL client certificate filename + * @RAPTOR_OPTION_WWW_CERT_TYPE: String. SSL client certificate type + * @RAPTOR_OPTION_WWW_CERT_PASSPHRASE: String. SSL client certificate passphrase + * @RAPTOR_OPTION_WWW_SSL_VERIFY_PEER: Integer. SSL verify peer - non-0 to verify peer SSL certificate (default) + * @RAPTOR_OPTION_WWW_SSL_VERIFY_HOST: Integer. SSL verify host - 0 none, 1 CN match, 2 host match (default). Other values are ignored. + * @RAPTOR_OPTION_NO_FILE: Deny file reading requests inside other requests. + * @RAPTOR_OPTION_LOAD_EXTERNAL_ENTITIES: When reading XML, load external entities. + * @RAPTOR_OPTION_LAST: Internal + * + * Raptor parser, serializer or XML writer options. + */ +typedef enum { + RAPTOR_OPTION_SCANNING, + RAPTOR_OPTION_ALLOW_NON_NS_ATTRIBUTES, + RAPTOR_OPTION_ALLOW_OTHER_PARSETYPES, + RAPTOR_OPTION_ALLOW_BAGID, + RAPTOR_OPTION_ALLOW_RDF_TYPE_RDF_LIST, + RAPTOR_OPTION_NORMALIZE_LANGUAGE, + RAPTOR_OPTION_NON_NFC_FATAL, + RAPTOR_OPTION_WARN_OTHER_PARSETYPES, + RAPTOR_OPTION_CHECK_RDF_ID, + RAPTOR_OPTION_RELATIVE_URIS, + RAPTOR_OPTION_WRITER_AUTO_INDENT, + RAPTOR_OPTION_WRITER_AUTO_EMPTY, + RAPTOR_OPTION_WRITER_INDENT_WIDTH, + RAPTOR_OPTION_WRITER_XML_VERSION, + RAPTOR_OPTION_WRITER_XML_DECLARATION, + RAPTOR_OPTION_NO_NET, + RAPTOR_OPTION_RESOURCE_BORDER, + RAPTOR_OPTION_LITERAL_BORDER, + RAPTOR_OPTION_BNODE_BORDER, + RAPTOR_OPTION_RESOURCE_FILL, + RAPTOR_OPTION_LITERAL_FILL, + RAPTOR_OPTION_BNODE_FILL, + RAPTOR_OPTION_HTML_TAG_SOUP, + RAPTOR_OPTION_MICROFORMATS, + RAPTOR_OPTION_HTML_LINK, + RAPTOR_OPTION_WWW_TIMEOUT, + RAPTOR_OPTION_WRITE_BASE_URI, + RAPTOR_OPTION_WWW_HTTP_CACHE_CONTROL, + RAPTOR_OPTION_WWW_HTTP_USER_AGENT, + RAPTOR_OPTION_JSON_CALLBACK, + RAPTOR_OPTION_JSON_EXTRA_DATA, + RAPTOR_OPTION_RSS_TRIPLES, + RAPTOR_OPTION_ATOM_ENTRY_URI, + RAPTOR_OPTION_PREFIX_ELEMENTS, + RAPTOR_OPTION_STRICT, + RAPTOR_OPTION_WWW_CERT_FILENAME, + RAPTOR_OPTION_WWW_CERT_TYPE, + RAPTOR_OPTION_WWW_CERT_PASSPHRASE, + RAPTOR_OPTION_NO_FILE, + RAPTOR_OPTION_WWW_SSL_VERIFY_PEER, + RAPTOR_OPTION_WWW_SSL_VERIFY_HOST, + RAPTOR_OPTION_LOAD_EXTERNAL_ENTITIES, + RAPTOR_OPTION_LAST = RAPTOR_OPTION_LOAD_EXTERNAL_ENTITIES +} raptor_option; + + +/** + * raptor_term_literal_value: + * @string: literal string + * @string_len: length of string + * @datatype: datatype URI (or NULL) + * @language: literal language (or NULL) + * @language_len: length of language + * + * Literal term value - this typedef exists solely for use in #raptor_term + * + * Either @datatype or @language may be non-NULL but not both. + */ +typedef struct { + unsigned char *string; + unsigned int string_len; + + raptor_uri *datatype; + + unsigned char *language; + unsigned char language_len; +} raptor_term_literal_value; + + +/** + * raptor_term_blank_value: + * @string: literal string + * @string_len: length of string + * + * Blank term value - this typedef exists solely for use in #raptor_term + * + */ +typedef struct { + unsigned char *string; + unsigned int string_len; +} raptor_term_blank_value; + + +/** + * raptor_term_value: + * @uri: uri value when term type is #RAPTOR_TERM_TYPE_URI + * @literal: literal value when term type is #RAPTOR_TERM_TYPE_LITERAL + * @blank: blank value when term type is #RAPTOR_TERM_TYPE_BLANK + * + * Term value - this typedef exists solely for use in #raptor_term + * + **/ +typedef union { + raptor_uri *uri; + + raptor_term_literal_value literal; + + raptor_term_blank_value blank; +} raptor_term_value; + + +/** + * raptor_term: + * @world: world + * @usage: usage reference count (if >0) + * @type: term type + * @value: term values per type + * + * An RDF statement term + * + */ +typedef struct { + raptor_world* world; + + int usage; + + raptor_term_type type; + + raptor_term_value value; + +} raptor_term; + + +/** + * raptor_statement: + * @world: world pointer + * @usage: usage count + * @subject: statement subject + * @predicate: statement predicate + * @object: statement object + * @graph: statement graph name (or NULL if not present) + * + * An RDF triple with optional graph name (quad) + * + * See #raptor_term for a description of how the fields may be used. + * As returned by a parser statement_handler. + */ +typedef struct { + raptor_world* world; + int usage; + raptor_term* subject; + raptor_term* predicate; + raptor_term* object; + raptor_term* graph; +} raptor_statement; + + +/** + * raptor_log_level: + * @RAPTOR_LOG_LEVEL_NONE: Internal + * @RAPTOR_LOG_LEVEL_TRACE: very fine-grained tracing messages information + * @RAPTOR_LOG_LEVEL_DEBUG: fine-grained tracing messages suitable for debugging + * @RAPTOR_LOG_LEVEL_INFO: coarse-grained information messages + * @RAPTOR_LOG_LEVEL_WARN: warning messages of potentially harmful problems + * @RAPTOR_LOG_LEVEL_ERROR: error messages where the application can continue + * @RAPTOR_LOG_LEVEL_FATAL: fatal error message where the application will likely abort + * @RAPTOR_LOG_LEVEL_LAST: Internal + * + * Log levels + */ +typedef enum { + RAPTOR_LOG_LEVEL_NONE, + RAPTOR_LOG_LEVEL_TRACE, + RAPTOR_LOG_LEVEL_DEBUG, + RAPTOR_LOG_LEVEL_INFO, + RAPTOR_LOG_LEVEL_WARN, + RAPTOR_LOG_LEVEL_ERROR, + RAPTOR_LOG_LEVEL_FATAL, + RAPTOR_LOG_LEVEL_LAST = RAPTOR_LOG_LEVEL_FATAL +} raptor_log_level; + + +/** + * raptor_domain: + * @RAPTOR_DOMAIN_IOSTREAM: I/O stream + * @RAPTOR_DOMAIN_NAMESPACE: XML Namespace / namespace stack + * @RAPTOR_DOMAIN_PARSER: RDF Parser + * @RAPTOR_DOMAIN_QNAME: XML QName + * @RAPTOR_DOMAIN_SAX2: XML SAX2 + * @RAPTOR_DOMAIN_SERIALIZER: RDF Serializer + * @RAPTOR_DOMAIN_TERM: RDF Term + * @RAPTOR_DOMAIN_TURTLE_WRITER: Turtle Writer + * @RAPTOR_DOMAIN_URI: RDF Uri + * @RAPTOR_DOMAIN_WORLD: RDF world + * @RAPTOR_DOMAIN_WWW: WWW + * @RAPTOR_DOMAIN_XML_WRITER: XML Writer + * @RAPTOR_DOMAIN_NONE: Internal + * @RAPTOR_DOMAIN_LAST: Internal + * + * Log domain + */ +typedef enum { + RAPTOR_DOMAIN_NONE, + RAPTOR_DOMAIN_IOSTREAM, + RAPTOR_DOMAIN_NAMESPACE, + RAPTOR_DOMAIN_PARSER, + RAPTOR_DOMAIN_QNAME, + RAPTOR_DOMAIN_SAX2, + RAPTOR_DOMAIN_SERIALIZER, + RAPTOR_DOMAIN_TERM, + RAPTOR_DOMAIN_TURTLE_WRITER, + RAPTOR_DOMAIN_URI, + RAPTOR_DOMAIN_WORLD, + RAPTOR_DOMAIN_WWW, + RAPTOR_DOMAIN_XML_WRITER, + RAPTOR_DOMAIN_LAST = RAPTOR_DOMAIN_XML_WRITER +} raptor_domain; + + +/** + * raptor_log_message: + * @code: error code or < 0 if not used or known + * @domain: message domain or #RAPTOR_DOMAIN_NONE if not used or known + * @level: log message level + * @locator: location associated with message or NULL if not known + * @text: message string + * + * Log message. + */ +typedef struct { + int code; + raptor_domain domain; + raptor_log_level level; + raptor_locator *locator; + const char *text; +} raptor_log_message; + + +/** + * raptor_log_handler: + * @user_data: user data + * @message: log message + * + * Handler function for log messages with location + * + * Used during parsing and serializing for errors and warnings that + * may include location information. Handlers may be set + * by raptor_world_set_log_handler(). + * + */ +typedef void (*raptor_log_handler)(void *user_data, raptor_log_message *message); + + +/** + * raptor_statement_handler: + * @user_data: user data + * @statement: statement to report + * + * Statement (triple) reporting handler function. + * + * This handler function set with + * raptor_parser_set_statement_handler() on a parser receives + * statements as the parsing proceeds. The @statement argument to the + * handler is shared and must be copied by the caller with + * raptor_statement_copy(). + */ +typedef void (*raptor_statement_handler)(void *user_data, raptor_statement *statement); + +/** + * raptor_graph_mark_flags: + * @RAPTOR_GRAPH_MARK_START: mark is start of graph (otherwise is end) + * @RAPTOR_GRAPH_MARK_DECLARED: mark was declared in syntax rather than implict + * + * Graph mark handler bitmask flags + */ +typedef enum { + RAPTOR_GRAPH_MARK_START = 1, + RAPTOR_GRAPH_MARK_DECLARED = 2 +} raptor_graph_mark_flags; + + +/** + * raptor_graph_mark_handler: + * @user_data: user data + * @graph: graph to report, NULL for the default graph + * @flags: bitmask of #raptor_graph_mark_flags flags + * + * Graph start/end mark handler function. + * + * Records start and end of graphs happening in a stream of generated + * #raptor_statement via the statement handler. The callback starts a + * graph when @flags has #RAPTOR_GRAPH_MARK_START bit set. + * + * The start and ends may be either declared in the syntax via some + * keyword or mechanism such as TRiG {} syntax when @flags has bit + * #RAPTOR_GRAPH_MARK_DECLARED set, or be implied by the start/end of + * the data in other syntaxes, and the bit will be unset. + */ +typedef void (*raptor_graph_mark_handler)(void *user_data, raptor_uri *graph, int flags); + +/** + * raptor_generate_bnodeid_handler: + * @user_data: user data + * @user_bnodeid: a user-specified ID or NULL if none available. + * + * Generate a blank node identifier handler function. + * + * Return value: new blank node ID to use + */ +typedef unsigned char* (*raptor_generate_bnodeid_handler)(void *user_data, unsigned char* user_bnodeid); + +/** + * raptor_namespace_handler: + * @user_data: user data + * @nspace: #raptor_namespace declared + * + * XML Namespace declaration reporting handler set by + * raptor_parser_set_namespace_handler(). + */ +typedef void (*raptor_namespace_handler)(void* user_data, raptor_namespace *nspace); + + +/** + * raptor_www_write_bytes_handler: + * @www: WWW object + * @userdata: user data + * @ptr: data pointer + * @size: size of individual item + * @nmemb: number of items + * + * Receiving bytes of data from WWW retrieval handler. + * + * Set by raptor_www_set_write_bytes_handler(). + */ +typedef void (*raptor_www_write_bytes_handler)(raptor_www* www, void *userdata, const void *ptr, size_t size, size_t nmemb); + +/** + * raptor_www_content_type_handler: + * @www: WWW object + * @userdata: user data + * @content_type: content type seen + * + * Receiving Content-Type: header from WWW retrieval handler. + * + * Set by raptor_www_set_content_type_handler(). + */ +typedef void (*raptor_www_content_type_handler)(raptor_www* www, void *userdata, const char *content_type); + +/** + * raptor_www_final_uri_handler: + * @www: WWW object + * @userdata: user data + * @final_uri: final URI seen + * + * Receiving the final resolved URI from a WWW retrieval + * + * Set by raptor_www_set_final_uri_handler(). + */ +typedef void (*raptor_www_final_uri_handler)(raptor_www* www, void *userdata, raptor_uri *final_uri); + +/** + * raptor_uri_filter_func: + * @user_data: user data + * @uri: #raptor_uri URI to check + * + * Callback function for #raptor_www_set_uri_filter + * + * Return value: non-0 to filter the URI + */ +typedef int (*raptor_uri_filter_func)(void *user_data, raptor_uri* uri); + + +/** + * raptor_world_flag: + * @RAPTOR_WORLD_FLAG_LIBXML_GENERIC_ERROR_SAVE: if set (non-0 value) - save/restore the libxml generic error handler when raptor library initializes (default set) + * @RAPTOR_WORLD_FLAG_LIBXML_STRUCTURED_ERROR_SAVE: if set (non-0 value) - save/restore the libxml structured error handler when raptor library terminates (default set) + * @RAPTOR_WORLD_FLAG_URI_INTERNING: if set (non-0 value) - each URI is saved interned in-memory and reused (default set) + * @RAPTOR_WORLD_FLAG_WWW_SKIP_INIT_FINISH: if set (non-0 value) the raptor will neither initialise or terminate the lower level WWW library. Usually in raptor initialising either curl_global_init (for libcurl) are called and in raptor cleanup, curl_global_cleanup is called. This flag allows the application finer control over these libraries such as setting other global options or potentially calling and terminating raptor several times. It does mean that applications which use this call must do their own extra work in order to allocate and free all resources to the system. + * + * Raptor world flags + * + * These are used by raptor_world_set_flags() to control raptor-wide + * options across classes. These must be set before + * raptor_world_open() is called explicitly or implicitly (by + * creating a raptor object). There is no enumeration function for + * these flags because they are not user options and must be set + * before the library is initialised. For similar reasons, there is + * no get function. + * + * If any libxml handler saving/restoring is enabled, any existing + * handler and context is saved before parsing and restored + * afterwards. Otherwise, no saving/restoring is performed. + * + */ +typedef enum { + RAPTOR_WORLD_FLAG_LIBXML_GENERIC_ERROR_SAVE = 1, + RAPTOR_WORLD_FLAG_LIBXML_STRUCTURED_ERROR_SAVE = 2, + RAPTOR_WORLD_FLAG_URI_INTERNING = 3, + RAPTOR_WORLD_FLAG_WWW_SKIP_INIT_FINISH = 4 +} raptor_world_flag; + + +/** + * raptor_data_compare_arg_handler: + * @data1: first object + * @data2: second object + * @user_data: user data argument + * + * Function to compare two data objects with a user data argument + * + * Designed to be used with raptor_sort_r() and compatible functions + * such as raptor_sequence_sort_r() which uses it. + * + * Return value: compare value <0 if @data1 is before @data2, =0 if equal, >0 if @data1 is after @data2 + */ +typedef int (*raptor_data_compare_arg_handler)(const void *data1, const void *data2, void *user_data); + + +/** + * raptor_data_compare_handler: + * @data1: first data object + * @data2: second data object + * + * Function to compare two data objects - signature like strcmp() and function pssed to qsort() + * + * Designed to be passed into generic data structure constructors + * like raptor_new_avltree(). + * + * Return value: compare value <0 if @data1 is before @data2, =0 if equal, >0 if @data1 is after @data2 + */ +typedef int (*raptor_data_compare_handler)(const void* data1, const void* data2); + + +/** + * raptor_data_malloc_handler: + * @size: data size + * + * Typedef for a function to allocate memory - signature like malloc() + * + * Designed to be passed into constructors + * like raptor_www_fetch_to_string + * + * Return value: pointer to newly allocated memory or NULL on failure + */ +typedef void* (*raptor_data_malloc_handler)(size_t size); + + +/** + * raptor_data_free_handler: + * @data: data object or NULL + * + * Typedef for function to free a data object - signature like free() + * + * Designed to be passed into generic data structure constructors + * like raptor_new_avltree(). If @data is NULL, nothing should be done. + */ +typedef void (*raptor_data_free_handler)(void* data); + + +/** + * raptor_data_context_free_handler: + * @context: context data for the free function + * @object: object to free + * + * Handler function for freeing a sequence item with a contextual pointer. + * + * Set by raptor_new_sequence_with_context(). +*/ +typedef void (*raptor_data_context_free_handler)(void* context, void* object); + +/** + * raptor_data_print_handler: + * @object: object to print + * @fh: FILE* to print to + * + * Handler function for printing an object to a stream. + * + * Set by raptor_new_sequence() + * + * Return value: non-0 on failure + */ +typedef int (*raptor_data_print_handler)(void *object, FILE *fh); + +/** + * raptor_data_context_print_handler: + * @context: context data for the print function + * @object: object to print + * @fh: FILE* to print to + * + * Function function for printing an object with data context to a stream. + * + * Set by raptor_new_sequence_with_context() + * + * Return value: non-0 on failure + */ +typedef int (*raptor_data_context_print_handler)(void *context, void *object, FILE *fh); + +/** + * raptor_stringbuffer: + * + * Raptor string buffer class + */ +typedef struct raptor_stringbuffer_s raptor_stringbuffer; + + +/* Public functions */ + +#define raptor_new_world() raptor_new_world_internal(RAPTOR_VERSION) +/* The real target of the raptor_new_world() macro */ +RAPTOR_API +raptor_world *raptor_new_world_internal(unsigned int version_decimal); +RAPTOR_API +int raptor_world_open(raptor_world* world); +RAPTOR_API +void raptor_free_world(raptor_world* world); +RAPTOR_API +int raptor_world_set_libxslt_security_preferences(raptor_world *world, void *security_preferences); +RAPTOR_API +int raptor_world_set_flag(raptor_world *world, raptor_world_flag flag, int value); +RAPTOR_API +int raptor_world_set_log_handler(raptor_world *world, void *user_data, raptor_log_handler handler); +RAPTOR_API +void raptor_world_set_generate_bnodeid_handler(raptor_world* world, void *user_data, raptor_generate_bnodeid_handler handler); +RAPTOR_API +unsigned char* raptor_world_generate_bnodeid(raptor_world *world); +RAPTOR_API +void raptor_world_set_generate_bnodeid_parameters(raptor_world* world, char *prefix, int base); +RAPTOR_API +const char* raptor_log_level_get_label(raptor_log_level level); +RAPTOR_API +const char* raptor_domain_get_label(raptor_domain domain); + +/* Names */ +RAPTOR_API +int raptor_world_is_parser_name(raptor_world* world, const char *name); +RAPTOR_API +const char* raptor_world_guess_parser_name(raptor_world* world, raptor_uri *uri, const char *mime_type, const unsigned char *buffer, size_t len, const unsigned char *identifier); +RAPTOR_API +int raptor_world_is_serializer_name(raptor_world* world, const char *name); + +/* Syntax descriptions */ +RAPTOR_API +int raptor_world_get_parsers_count(raptor_world* world); +RAPTOR_API +int raptor_world_get_serializers_count(raptor_world* world); +RAPTOR_API +const raptor_syntax_description* raptor_world_get_parser_description(raptor_world* world, unsigned int counter); +RAPTOR_API +const raptor_syntax_description* raptor_world_get_serializer_description(raptor_world* world, unsigned int counter); +RAPTOR_API +int raptor_syntax_description_validate(raptor_syntax_description* desc); + +RAPTOR_API +raptor_option raptor_world_get_option_from_uri(raptor_world* world, raptor_uri *uri); + + +/* Term Class */ +RAPTOR_API +raptor_term* raptor_new_term_from_uri(raptor_world* world, raptor_uri* uri); +RAPTOR_API +raptor_term* raptor_new_term_from_counted_uri_string(raptor_world* world, const unsigned char *uri_string, size_t length); +RAPTOR_API +raptor_term* raptor_new_term_from_uri_string(raptor_world* world, const unsigned char *uri_string); +RAPTOR_API +raptor_term* raptor_new_term_from_literal(raptor_world* world, const unsigned char* literal, raptor_uri* datatype, const unsigned char* language); +RAPTOR_API +raptor_term* raptor_new_term_from_counted_literal(raptor_world* world, const unsigned char* literal, size_t literal_len, raptor_uri* datatype, const unsigned char* language, unsigned char language_len); +RAPTOR_API +raptor_term* raptor_new_term_from_blank(raptor_world* world, const unsigned char* blank); +RAPTOR_API +raptor_term* raptor_new_term_from_counted_blank(raptor_world* world, const unsigned char* blank, size_t length); +RAPTOR_API +raptor_term* raptor_new_term_from_counted_string(raptor_world* world, unsigned char* string, size_t length); +RAPTOR_API +raptor_term* raptor_term_copy(raptor_term* term); +RAPTOR_API +int raptor_term_compare(const raptor_term *t1, const raptor_term *t2); +RAPTOR_API +int raptor_term_equals(raptor_term* t1, raptor_term* t2); +RAPTOR_API +void raptor_free_term(raptor_term *term); + +RAPTOR_API +unsigned char* raptor_term_to_counted_string(raptor_term *term, size_t* len_p); +RAPTOR_API +unsigned char* raptor_term_to_string(raptor_term *term); +RAPTOR_API +int raptor_term_escaped_write(const raptor_term *term, unsigned int flags, raptor_iostream* iostr); +RAPTOR_API RAPTOR_DEPRECATED +int raptor_term_ntriples_write(const raptor_term *term, raptor_iostream* iostr); +RAPTOR_API +int raptor_uri_turtle_write(raptor_world *world, raptor_iostream* iostr, raptor_uri* uri, raptor_namespace_stack *nstack, raptor_uri *base_uri); +RAPTOR_API +int raptor_term_turtle_write(raptor_iostream* iostr, raptor_term* term, raptor_namespace_stack *nstack, raptor_uri *base_uri); +RAPTOR_API +unsigned char* raptor_uri_to_turtle_counted_string(raptor_world *world, raptor_uri* uri, raptor_namespace_stack *nstack, raptor_uri *base_uri, size_t *len_p); +RAPTOR_API +unsigned char* raptor_uri_to_turtle_string(raptor_world *world, raptor_uri* uri, raptor_namespace_stack *nstack, raptor_uri *base_uri); +RAPTOR_API +unsigned char* raptor_term_to_turtle_counted_string(raptor_term* term, raptor_namespace_stack *nstack, raptor_uri *base_uri, size_t *len_p); +RAPTOR_API +unsigned char* raptor_term_to_turtle_string(raptor_term* term, raptor_namespace_stack *nstack, raptor_uri *base_uri); + + +/* Statement Class */ +RAPTOR_API +void raptor_statement_init(raptor_statement *statement, raptor_world *world); +RAPTOR_API +void raptor_statement_clear(raptor_statement *statement); +RAPTOR_API +raptor_statement* raptor_new_statement(raptor_world *world); +RAPTOR_API +raptor_statement* raptor_new_statement_from_nodes(raptor_world* world, raptor_term *subject, raptor_term *predicate, raptor_term *object, raptor_term *graph); +RAPTOR_API +raptor_statement* raptor_statement_copy(raptor_statement *statement); +RAPTOR_API +void raptor_free_statement(raptor_statement *statement); + +RAPTOR_API +int raptor_statement_print(const raptor_statement * statement, FILE *stream); +RAPTOR_API +int raptor_statement_print_as_ntriples(const raptor_statement * statement, FILE *stream); +RAPTOR_API +int raptor_statement_compare(const raptor_statement *s1, const raptor_statement *s2); +RAPTOR_API +int raptor_statement_equals(const raptor_statement* s1, const raptor_statement* s2); + + +/* Parser Class */ +RAPTOR_API +raptor_parser* raptor_new_parser(raptor_world* world, const char *name); +RAPTOR_API +raptor_parser* raptor_new_parser_for_content(raptor_world* world, raptor_uri *uri, const char *mime_type, const unsigned char *buffer, size_t len, const unsigned char *identifier); +RAPTOR_API +void raptor_free_parser(raptor_parser* parser); + +/* methods */ + +/* Handlers */ +RAPTOR_API +void raptor_parser_set_statement_handler(raptor_parser* parser, void *user_data, raptor_statement_handler handler); +RAPTOR_API +void raptor_parser_set_graph_mark_handler(raptor_parser* parser, void *user_data, raptor_graph_mark_handler handler); +RAPTOR_API +void raptor_parser_set_namespace_handler(raptor_parser* parser, void *user_data, raptor_namespace_handler handler); +RAPTOR_API +void raptor_parser_set_uri_filter(raptor_parser* parser, raptor_uri_filter_func filter, void* user_data); +RAPTOR_API +raptor_locator* raptor_parser_get_locator(raptor_parser* rdf_parser); + + +/* Parsing functions */ +RAPTOR_API +int raptor_parser_parse_start(raptor_parser *rdf_parser, raptor_uri *uri); +RAPTOR_API +int raptor_parser_parse_chunk(raptor_parser* rdf_parser, const unsigned char *buffer, size_t len, int is_end); +RAPTOR_API +int raptor_parser_parse_file_stream(raptor_parser* rdf_parser, FILE *stream, const char *filename, raptor_uri *base_uri); +RAPTOR_API +int raptor_parser_parse_file(raptor_parser* rdf_parser, raptor_uri *uri, raptor_uri *base_uri); +RAPTOR_API +int raptor_parser_parse_uri(raptor_parser* rdf_parser, raptor_uri *uri, raptor_uri *base_uri); +RAPTOR_API +int raptor_parser_parse_uri_with_connection(raptor_parser* rdf_parser, raptor_uri *uri, raptor_uri *base_uri, void *connection); +RAPTOR_API +int raptor_parser_parse_iostream(raptor_parser* rdf_parser, raptor_iostream *iostr, raptor_uri *base_uri); +RAPTOR_API +void raptor_parser_parse_abort(raptor_parser* rdf_parser); +RAPTOR_API +const char* raptor_parser_get_name(raptor_parser *rdf_parser); +RAPTOR_API +const raptor_syntax_description* raptor_parser_get_description(raptor_parser *rdf_parser); + +/* parser option methods */ +RAPTOR_API +int raptor_parser_set_option(raptor_parser *parser, raptor_option option, const char* string, int integer); +RAPTOR_API +int raptor_parser_get_option(raptor_parser *parser, raptor_option option, char** string_p, int* integer_p); + +/* parser utility methods */ +RAPTOR_API +const char* raptor_parser_get_accept_header(raptor_parser* rdf_parser); +RAPTOR_API +raptor_world* raptor_parser_get_world(raptor_parser* rdf_parser); +RAPTOR_API +raptor_uri* raptor_parser_get_graph(raptor_parser* rdf_parser); + + +/* Locator Class */ +/* methods */ +RAPTOR_API +int raptor_locator_print(raptor_locator* locator, FILE *stream); +RAPTOR_API +int raptor_locator_format(char *buffer, size_t length, raptor_locator* locator); +RAPTOR_API +int raptor_locator_line(raptor_locator *locator); +RAPTOR_API +int raptor_locator_column(raptor_locator *locator); +RAPTOR_API +int raptor_locator_byte(raptor_locator *locator); +RAPTOR_API +const char* raptor_locator_file(raptor_locator *locator); +RAPTOR_API +const char* raptor_locator_uri(raptor_locator *locator); + + +/* Serializer Class */ +RAPTOR_API +raptor_serializer* raptor_new_serializer(raptor_world* world, const char *name); +RAPTOR_API +void raptor_free_serializer(raptor_serializer* rdf_serializer); + +/* methods */ +RAPTOR_API +int raptor_serializer_start_to_iostream(raptor_serializer *rdf_serializer, raptor_uri *uri, raptor_iostream *iostream); +RAPTOR_API +int raptor_serializer_start_to_filename(raptor_serializer *rdf_serializer, const char *filename); +RAPTOR_API +int raptor_serializer_start_to_string(raptor_serializer *rdf_serializer, raptor_uri *uri, void **string_p, size_t *length_p); +RAPTOR_API +int raptor_serializer_start_to_file_handle(raptor_serializer *rdf_serializer, raptor_uri *uri, FILE *fh); +RAPTOR_API +int raptor_serializer_set_namespace(raptor_serializer* rdf_serializer, raptor_uri *uri, const unsigned char *prefix); +RAPTOR_API +int raptor_serializer_set_namespace_from_namespace(raptor_serializer* rdf_serializer, raptor_namespace *nspace); +RAPTOR_API +int raptor_serializer_serialize_statement(raptor_serializer* rdf_serializer, raptor_statement *statement); +RAPTOR_API +int raptor_serializer_serialize_end(raptor_serializer *rdf_serializer); +RAPTOR_API +raptor_iostream* raptor_serializer_get_iostream(raptor_serializer *serializer); +RAPTOR_API +raptor_locator* raptor_serializer_get_locator(raptor_serializer *rdf_serializer); +RAPTOR_API +int raptor_serializer_flush(raptor_serializer *rdf_serializer); +RAPTOR_API +const raptor_syntax_description* raptor_serializer_get_description(raptor_serializer *rdf_serializer); + +/* serializer option methods */ +RAPTOR_API +int raptor_serializer_set_option(raptor_serializer *serializer, raptor_option option, const char* string, int integer); +RAPTOR_API +int raptor_serializer_get_option(raptor_serializer *serializer, raptor_option option, char** string_p, int* integer_p); + +/* utility methods */ +RAPTOR_API +raptor_world* raptor_serializer_get_world(raptor_serializer* rdf_serializer); + + +/* memory functions */ +RAPTOR_API +void raptor_free_memory(void *ptr); +RAPTOR_API +void* raptor_alloc_memory(size_t size); +RAPTOR_API +void* raptor_calloc_memory(size_t nmemb, size_t size); + + +/* URI Class */ +RAPTOR_API +raptor_uri* raptor_new_uri_from_counted_string(raptor_world* world, const unsigned char *uri_string, size_t length); +RAPTOR_API +raptor_uri* raptor_new_uri(raptor_world* world, const unsigned char *uri_string); +RAPTOR_API +raptor_uri* raptor_new_uri_from_uri_local_name(raptor_world* world, raptor_uri *uri, const unsigned char *local_name); +RAPTOR_API +raptor_uri* raptor_new_uri_relative_to_base(raptor_world* world, raptor_uri *base_uri, const unsigned char *uri_string); +RAPTOR_API +raptor_uri* raptor_new_uri_relative_to_base_counted(raptor_world* world, raptor_uri *base_uri, const unsigned char *uri_string, size_t uri_len); +RAPTOR_API +raptor_uri* raptor_new_uri_from_id(raptor_world* world, raptor_uri *base_uri, const unsigned char *id); +RAPTOR_API +raptor_uri* raptor_new_uri_from_uri_or_file_string(raptor_world* world, raptor_uri* base_uri, const unsigned char* uri_or_file_string); +RAPTOR_API +raptor_uri* raptor_new_uri_for_rdf_concept(raptor_world* world, const unsigned char *name); +RAPTOR_API +raptor_uri* raptor_new_uri_for_xmlbase(raptor_uri* old_uri); +RAPTOR_API +raptor_uri* raptor_new_uri_for_retrieval(raptor_uri* old_uri); +RAPTOR_API +void raptor_free_uri(raptor_uri *uri); + +/* methods */ +RAPTOR_API +int raptor_uri_equals(raptor_uri* uri1, raptor_uri* uri2); +RAPTOR_API +int raptor_uri_compare(raptor_uri* uri1, raptor_uri* uri2); +RAPTOR_API +raptor_uri* raptor_uri_copy(raptor_uri *uri); +RAPTOR_API +unsigned char* raptor_uri_as_string(raptor_uri *uri); +RAPTOR_API +unsigned char* raptor_uri_as_counted_string(raptor_uri *uri, size_t* len_p); +RAPTOR_API +unsigned char* raptor_uri_to_relative_counted_uri_string(raptor_uri *base_uri, raptor_uri *reference_uri, size_t *length_p); +RAPTOR_API +unsigned char* raptor_uri_to_relative_uri_string(raptor_uri *base_uri, raptor_uri *reference_uri); +RAPTOR_API +int raptor_uri_print(const raptor_uri* uri, FILE *stream); +RAPTOR_API +unsigned char* raptor_uri_to_counted_string(raptor_uri *uri, size_t *len_p); +RAPTOR_API +unsigned char* raptor_uri_to_string(raptor_uri *uri); +RAPTOR_API +raptor_world* raptor_uri_get_world(raptor_uri *uri); +RAPTOR_API +int raptor_uri_file_exists(raptor_uri* uri); +RAPTOR_API +int raptor_uri_escaped_write(raptor_uri* uri, raptor_uri* base_uri, unsigned int flags, raptor_iostream *iostr); + +/* XML utility functions */ +RAPTOR_API +int raptor_xml_escape_string_any(raptor_world* world, const unsigned char *string, size_t len, unsigned char *buffer, size_t length, char quote, int xml_version); +RAPTOR_API +int raptor_xml_escape_string_any_write(const unsigned char *string, size_t len, char quote, int xml_version, raptor_iostream* iostr); +RAPTOR_API +int raptor_xml_escape_string(raptor_world *world, const unsigned char *string, size_t len, unsigned char *buffer, size_t length, char quote); +RAPTOR_API +int raptor_xml_escape_string_write(const unsigned char *string, size_t len, char quote, raptor_iostream* iostr); +RAPTOR_API +int raptor_xml_name_check(const unsigned char *string, size_t length, int xml_version); + + +/* portable vsnprintf utility function */ +RAPTOR_API RAPTOR_DEPRECATED +char* raptor_vsnprintf(const char *format, va_list arguments) RAPTOR_PRINTF_FORMAT(1, 0); +RAPTOR_API +int raptor_vsnprintf2(char *buffer, size_t size, const char *format, va_list arguments) RAPTOR_PRINTF_FORMAT(3, 0); +RAPTOR_API +int raptor_snprintf(char *buffer, size_t size, const char *format, ...) RAPTOR_PRINTF_FORMAT(3, 4); +RAPTOR_API +int raptor_vasprintf(char **ret, const char *format, va_list arguments) RAPTOR_PRINTF_FORMAT(2, 0); + +/* RFC2396 URI resolving functions */ +RAPTOR_API +size_t raptor_uri_resolve_uri_reference(const unsigned char *base_uri, const unsigned char *reference_uri, unsigned char* buffer, size_t length); + +/* URI String utility functions */ +RAPTOR_API +unsigned char* raptor_uri_counted_filename_to_uri_string(const char *filename, size_t filename_len); +RAPTOR_API +unsigned char* raptor_uri_filename_to_uri_string(const char *filename); +RAPTOR_API +int raptor_uri_filename_exists(const unsigned char* path); +RAPTOR_API +char* raptor_uri_uri_string_to_filename(const unsigned char *uri_string); +RAPTOR_API +char* raptor_uri_uri_string_to_filename_fragment(const unsigned char *uri_string, unsigned char **fragment_p); +RAPTOR_API +int raptor_uri_uri_string_is_file_uri(const unsigned char* uri_string); +RAPTOR_API +int raptor_stringbuffer_append_uri_escaped_counted_string(raptor_stringbuffer* sb, const char* string, size_t length, int space_is_plus); +RAPTOR_API +char* raptor_uri_uri_string_to_counted_filename_fragment(const unsigned char *uri_string, size_t* len_p, unsigned char **fragment_p, size_t* fragment_len_p); +RAPTOR_API +int raptor_uri_uri_string_is_absolute(const unsigned char* uri_string); + + +/** + * RAPTOR_RDF_MS_URI: + * + * RDF Namespace URI (rdf:). + * + * Copy with raptor_uri_copy() to use. + */ +#define RAPTOR_RDF_MS_URI raptor_rdf_namespace_uri + +/** + * RAPTOR_RDF_SCHEMA_URI: + * + * RDF Schema Namespace URI (rdfs:). + * + * Copy with raptor_uri_copy() to use. + */ +#define RAPTOR_RDF_SCHEMA_URI raptor_rdf_schema_namespace_uri + +/** + * RAPTOR_XMLSCHEMA_DATATYPES_URI: + * + * XML Schema Datatypes URI (xsd:). + * + * Copy with raptor_uri_copy() to use. + */ +#define RAPTOR_XMLSCHEMA_DATATYPES_URI raptor_xmlschema_datatypes_namespace_uri + +/** + * RAPTOR_OWL_URI: + * + * OWL Namespace URI (owl:). + * + * Copy with raptor_uri_copy() to use. + */ +#define RAPTOR_OWL_URI raptor_owl_namespace_uri + + +/* raptor_www */ +RAPTOR_API +raptor_www* raptor_new_www(raptor_world* world); +RAPTOR_API +raptor_www* raptor_new_www_with_connection(raptor_world* world, void* connection); +RAPTOR_API +void raptor_free_www(raptor_www *www); +RAPTOR_API +int raptor_www_set_ssl_cert_options(raptor_www* www, const char* cert_filename, const char* cert_type, const char* cert_passphrase); +RAPTOR_API +int raptor_www_set_ssl_verify_options(raptor_www* www, int verify_peer, int verify_host); +RAPTOR_API +void raptor_www_set_user_agent(raptor_www *www, const char *user_agent); +RAPTOR_API +void raptor_www_set_proxy(raptor_www *www, const char *proxy); +RAPTOR_API +void raptor_www_set_http_accept(raptor_www *www, const char *value); +RAPTOR_API +void raptor_www_set_write_bytes_handler(raptor_www *www, raptor_www_write_bytes_handler handler, void *user_data); +RAPTOR_API +void raptor_www_set_content_type_handler(raptor_www *www, raptor_www_content_type_handler handler, void *user_data); +RAPTOR_API +void raptor_www_set_final_uri_handler(raptor_www* www, raptor_www_final_uri_handler handler, void *user_data); +RAPTOR_API +void raptor_www_set_uri_filter(raptor_www* www, raptor_uri_filter_func filter, void* user_data); +RAPTOR_API +void raptor_www_set_connection_timeout(raptor_www* www, int timeout); +RAPTOR_API +int raptor_www_set_http_cache_control(raptor_www* www, const char* cache_control); +RAPTOR_API +int raptor_www_fetch(raptor_www *www, raptor_uri *uri); +RAPTOR_API +int raptor_www_fetch_to_string(raptor_www *www, raptor_uri *uri, void **string_p, size_t *length_p, raptor_data_malloc_handler const malloc_handler); +RAPTOR_API +void* raptor_www_get_connection(raptor_www *www); +RAPTOR_API +void raptor_www_abort(raptor_www *www, const char *reason); +RAPTOR_API +raptor_uri* raptor_www_get_final_uri(raptor_www* www); + + +/* XML QNames Class */ +RAPTOR_API +raptor_qname* raptor_new_qname(raptor_namespace_stack *nstack, const unsigned char *name, const unsigned char *value); +RAPTOR_API +raptor_qname* raptor_new_qname_from_namespace_local_name(raptor_world* world, raptor_namespace *ns, const unsigned char *local_name, const unsigned char *value); + +/* methods */ +RAPTOR_API +raptor_qname* raptor_qname_copy(raptor_qname *qname); +RAPTOR_API +void raptor_free_qname(raptor_qname* name); +RAPTOR_API +int raptor_qname_equal(raptor_qname *name1, raptor_qname *name2); +RAPTOR_API +unsigned char* raptor_qname_to_counted_name(raptor_qname *qname, size_t* length_p); +RAPTOR_API +const raptor_namespace* raptor_qname_get_namespace(raptor_qname* name); +RAPTOR_API +const unsigned char* raptor_qname_get_local_name(raptor_qname* name); +RAPTOR_API +const unsigned char* raptor_qname_get_value(raptor_qname* name); +RAPTOR_API +const unsigned char* raptor_qname_get_counted_value(raptor_qname* name, size_t* length_p); +RAPTOR_API +int raptor_qname_write(raptor_qname *qname, raptor_iostream* iostr); + +/* QName String utility functions */ +RAPTOR_API +raptor_uri* raptor_qname_string_to_uri(raptor_namespace_stack *nstack, const unsigned char *name, size_t name_len); +RAPTOR_API +unsigned char* raptor_qname_format_as_xml(const raptor_qname *qname, size_t *length_p); + +/* XML Namespaces Stack class */ +RAPTOR_API +raptor_namespace* raptor_new_namespace_from_uri(raptor_namespace_stack *nstack, const unsigned char *prefix, raptor_uri* ns_uri, int depth); +RAPTOR_API +raptor_namespace_stack* raptor_new_namespaces(raptor_world* world, int defaults); +RAPTOR_API +int raptor_namespaces_init(raptor_world* world, raptor_namespace_stack *nstack, int defaults); +RAPTOR_API +void raptor_namespaces_clear(raptor_namespace_stack *nstack); +RAPTOR_API +void raptor_free_namespaces(raptor_namespace_stack *nstack); + +/* methods */ +RAPTOR_API +void raptor_namespaces_start_namespace(raptor_namespace_stack *nstack, raptor_namespace *nspace); +RAPTOR_API +int raptor_namespaces_start_namespace_full(raptor_namespace_stack *nstack, const unsigned char *prefix, const unsigned char *ns_uri_string, int depth); +RAPTOR_API +void raptor_namespaces_end_for_depth(raptor_namespace_stack *nstack, int depth); +RAPTOR_API +raptor_namespace* raptor_namespaces_get_default_namespace(raptor_namespace_stack *nstack); +RAPTOR_API +raptor_namespace* raptor_namespaces_find_namespace(raptor_namespace_stack *nstack, const unsigned char *prefix, int prefix_length); +RAPTOR_API +raptor_namespace* raptor_namespaces_find_namespace_by_uri(raptor_namespace_stack *nstack, raptor_uri *ns_uri); +RAPTOR_API +int raptor_namespaces_namespace_in_scope(raptor_namespace_stack *nstack, const raptor_namespace *nspace); +RAPTOR_API +raptor_qname* raptor_new_qname_from_namespace_uri(raptor_namespace_stack *nstack, raptor_uri *uri, int xml_version); + + +/* XML Namespace Class */ +RAPTOR_API +raptor_namespace* raptor_new_namespace(raptor_namespace_stack *nstack, const unsigned char *prefix, const unsigned char *ns_uri_string, int depth); +RAPTOR_API +void raptor_free_namespace(raptor_namespace *ns); +RAPTOR_API +int raptor_namespace_stack_start_namespace(raptor_namespace_stack *nstack, raptor_namespace *ns, int new_depth); +RAPTOR_API +raptor_uri* raptor_namespace_get_uri(const raptor_namespace *ns); +RAPTOR_API +const unsigned char* raptor_namespace_get_prefix(const raptor_namespace *ns); +RAPTOR_API +const unsigned char* raptor_namespace_get_counted_prefix(const raptor_namespace *ns, size_t *length_p); +RAPTOR_API +unsigned char* raptor_namespace_format_as_xml(const raptor_namespace *ns, size_t *length_p); +RAPTOR_API +int raptor_namespace_write(raptor_namespace *ns, raptor_iostream* iostr); + +/* namespace string utility function */ +RAPTOR_API +int raptor_xml_namespace_string_parse(const unsigned char *string, unsigned char **prefix, unsigned char **uri_string); + +/* Sequence class */ +/** + * raptor_sequence: + * + * Raptor sequence class + */ +typedef struct raptor_sequence_s raptor_sequence; + +/* Sequence Class */ +RAPTOR_API +raptor_sequence* raptor_new_sequence(raptor_data_free_handler free_handler, raptor_data_print_handler print_handler); +RAPTOR_API +raptor_sequence* raptor_new_sequence_with_context(raptor_data_context_free_handler free_handler, raptor_data_context_print_handler print_handler, void* handler_context); +RAPTOR_API +void raptor_free_sequence(raptor_sequence* seq); + +/* methods */ +RAPTOR_API +int raptor_sequence_size(raptor_sequence* seq); +RAPTOR_API +int raptor_sequence_set_at(raptor_sequence* seq, int idx, void *data); +RAPTOR_API +int raptor_sequence_push(raptor_sequence* seq, void *data); +RAPTOR_API +int raptor_sequence_shift(raptor_sequence* seq, void *data); +RAPTOR_API +void* raptor_sequence_get_at(raptor_sequence* seq, int idx); +RAPTOR_API +void* raptor_sequence_pop(raptor_sequence* seq); +RAPTOR_API +void* raptor_sequence_unshift(raptor_sequence* seq); +RAPTOR_API +void* raptor_sequence_delete_at(raptor_sequence* seq, int idx); + +RAPTOR_API +void raptor_sequence_sort(raptor_sequence* seq, raptor_data_compare_handler compare); +RAPTOR_API +void raptor_sequence_sort_r(raptor_sequence* seq, raptor_data_compare_arg_handler compare, void* user_data); +RAPTOR_API +int raptor_sequence_swap(raptor_sequence* seq, int i, int j); +RAPTOR_API +int raptor_sequence_reverse(raptor_sequence* seq, int start_index, int length); +RAPTOR_API +int raptor_sequence_next_permutation(raptor_sequence *seq, raptor_data_compare_handler compare); + +/* helper for printing sequences of strings */ +RAPTOR_API +int raptor_sequence_print(raptor_sequence* seq, FILE* fh); +RAPTOR_API +int raptor_sequence_join(raptor_sequence* dest, raptor_sequence *src); + + +/* Unicode and UTF8 */ + +/** + * raptor_unichar: + * + * raptor Unicode codepoint + */ +typedef unsigned long raptor_unichar; +RAPTOR_API +int raptor_unicode_utf8_string_put_char(raptor_unichar c, unsigned char *output, size_t length); +RAPTOR_API +int raptor_unicode_utf8_string_get_char(const unsigned char *input, size_t length, raptor_unichar *output); +RAPTOR_API +int raptor_unicode_is_xml11_namestartchar(raptor_unichar c); +RAPTOR_API +int raptor_unicode_is_xml10_namestartchar(raptor_unichar c); +RAPTOR_API +int raptor_unicode_is_xml11_namechar(raptor_unichar c); +RAPTOR_API +int raptor_unicode_is_xml10_namechar(raptor_unichar c); +RAPTOR_API +int raptor_unicode_check_utf8_string(const unsigned char *string, size_t length); +RAPTOR_API +int raptor_unicode_utf8_strlen(const unsigned char *string, size_t length); +RAPTOR_API +size_t raptor_unicode_utf8_substr(unsigned char* dest, size_t* dest_length_p, const unsigned char* src, size_t src_length, int startingLoc, int length); + +/* Stringbuffer Class */ +RAPTOR_API +raptor_stringbuffer* raptor_new_stringbuffer(void); +RAPTOR_API +void raptor_free_stringbuffer(raptor_stringbuffer *stringbuffer); + +/* methods */ +RAPTOR_API +int raptor_stringbuffer_append_counted_string(raptor_stringbuffer* stringbuffer, const unsigned char *string, size_t length, int do_copy); +RAPTOR_API +int raptor_stringbuffer_append_string(raptor_stringbuffer* stringbuffer, const unsigned char *string, int do_copy); +RAPTOR_API +int raptor_stringbuffer_append_decimal(raptor_stringbuffer* stringbuffer, int integer); +RAPTOR_API +int raptor_stringbuffer_append_hexadecimal(raptor_stringbuffer* stringbuffer, int hex); +RAPTOR_API +int raptor_stringbuffer_append_stringbuffer(raptor_stringbuffer* stringbuffer, raptor_stringbuffer* append); +RAPTOR_API +int raptor_stringbuffer_prepend_counted_string(raptor_stringbuffer* stringbuffer, const unsigned char *string, size_t length, int do_copy); +RAPTOR_API +int raptor_stringbuffer_prepend_string(raptor_stringbuffer* stringbuffer, const unsigned char *string, int do_copy); +RAPTOR_API +unsigned char* raptor_stringbuffer_as_string(raptor_stringbuffer* stringbuffer); +RAPTOR_API +size_t raptor_stringbuffer_length(raptor_stringbuffer* stringbuffer); +RAPTOR_API +int raptor_stringbuffer_copy_to_string(raptor_stringbuffer* stringbuffer, unsigned char *string, size_t length); + +/** + * raptor_iostream_init_func: + * @context: stream context data + * + * Handler function for #raptor_iostream initialising. + * + * Return value: non-0 on failure. + */ +typedef int (*raptor_iostream_init_func) (void *context); + +/** + * raptor_iostream_finish_func: + * @context: stream context data + * + * Handler function for #raptor_iostream terminating. + * + */ +typedef void (*raptor_iostream_finish_func) (void *context); + +/** + * raptor_iostream_write_byte_func + * @context: stream context data + * @byte: byte to write + * + * Handler function for implementing raptor_iostream_write_byte(). + * + * Return value: non-0 on failure. + */ +typedef int (*raptor_iostream_write_byte_func) (void *context, const int byte); + +/** + * raptor_iostream_write_bytes_func: + * @context: stream context data + * @ptr: pointer to bytes to write + * @size: size of item + * @nmemb: number of items + * + * Handler function for implementing raptor_iostream_write_bytes(). + * + * Return value: non-0 on failure. + */ +typedef int (*raptor_iostream_write_bytes_func) (void *context, const void *ptr, size_t size, size_t nmemb); + +/** + * raptor_iostream_write_end_func: + * @context: stream context data + * + * Handler function for implementing raptor_iostream_write_end(). + * + * Return value: non-0 on failure. + */ +typedef int (*raptor_iostream_write_end_func) (void *context); + +/** + * raptor_iostream_read_bytes_func: + * @context: stream context data + * @ptr: pointer to buffer to read into + * @size: size of buffer + * @nmemb: number of items + * + * Handler function for implementing raptor_iostream_read_bytes(). + * + * Return value: number of items read, 0 or < @size on EOF, <0 on failure + */ +typedef int (*raptor_iostream_read_bytes_func) (void *context, void *ptr, size_t size, size_t nmemb); + +/** + * raptor_iostream_read_eof_func: + * @context: stream context data + * + * Handler function for implementing raptor_iostream_read_eof(). + * + * Return value: non-0 if EOF + */ +typedef int (*raptor_iostream_read_eof_func) (void *context); + +/** + * raptor_iostream_handler: + * @version: interface version. Presently 1 or 2. + * @init: initialisation handler - optional, called at most once (V1) + * @finish: finishing handler - optional, called at most once (V1) + * @write_byte: write byte handler - required (for writing) (V1) + * @write_bytes: write bytes handler - required (for writing) (V1) + * @write_end: write end handler - optional (for writing), called at most once (V1) + * @read_bytes: read bytes handler - required (for reading) (V2) + * @read_eof: read EOF handler - required (for reading) (V2) + * + * I/O stream implementation handler structure. + * + */ +typedef struct { + int version; + + /* V1 functions */ + raptor_iostream_init_func init; + raptor_iostream_finish_func finish; + raptor_iostream_write_byte_func write_byte; + raptor_iostream_write_bytes_func write_bytes; + raptor_iostream_write_end_func write_end; + + /* V2 functions */ + raptor_iostream_read_bytes_func read_bytes; + raptor_iostream_read_eof_func read_eof; +} raptor_iostream_handler; + + +/* I/O Stream Class */ +RAPTOR_API +raptor_iostream* raptor_new_iostream_from_handler(raptor_world* world, void *user_data, const raptor_iostream_handler* const handler); +RAPTOR_API +raptor_iostream* raptor_new_iostream_to_sink(raptor_world* world); +RAPTOR_API +raptor_iostream* raptor_new_iostream_to_filename(raptor_world* world, const char *filename); +RAPTOR_API +raptor_iostream* raptor_new_iostream_to_file_handle(raptor_world* world, FILE *handle); +RAPTOR_API +raptor_iostream* raptor_new_iostream_to_string(raptor_world* world, void **string_p, size_t *length_p, raptor_data_malloc_handler const malloc_handler); +RAPTOR_API +raptor_iostream* raptor_new_iostream_from_sink(raptor_world* world); +RAPTOR_API +raptor_iostream* raptor_new_iostream_from_filename(raptor_world* world, const char *filename); +RAPTOR_API +raptor_iostream* raptor_new_iostream_from_file_handle(raptor_world* world, FILE *handle); +RAPTOR_API +raptor_iostream* raptor_new_iostream_from_string(raptor_world* world, void *string, size_t length); +RAPTOR_API +void raptor_free_iostream(raptor_iostream *iostr); + +RAPTOR_API +int raptor_iostream_write_bytes(const void *ptr, size_t size, size_t nmemb, raptor_iostream *iostr); +RAPTOR_API +int raptor_iostream_write_byte(const int byte, raptor_iostream *iostr); +RAPTOR_API +int raptor_iostream_write_end(raptor_iostream *iostr); +RAPTOR_API +int raptor_iostream_string_write(const void *string, raptor_iostream *iostr); +RAPTOR_API +int raptor_iostream_counted_string_write(const void *string, size_t len, raptor_iostream *iostr); +RAPTOR_API +unsigned long raptor_iostream_tell(raptor_iostream *iostr); +RAPTOR_API +int raptor_iostream_decimal_write(int integer, raptor_iostream* iostr); +RAPTOR_API +int raptor_iostream_hexadecimal_write(unsigned int integer, int width, raptor_iostream* iostr); +RAPTOR_API +int raptor_stringbuffer_write(raptor_stringbuffer *sb, raptor_iostream* iostr); +RAPTOR_API +int raptor_uri_write(raptor_uri *uri, raptor_iostream *iostr); +RAPTOR_API +int raptor_iostream_read_bytes(void *ptr, size_t size, size_t nmemb, raptor_iostream* iostr); +RAPTOR_API +int raptor_iostream_read_eof(raptor_iostream *iostr); + +/* I/O Stream utility functions */ + +/** + * raptor_escaped_write_bitflags: + * @RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF : Allow \b \f, + * @RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_TNRU : ALlow \t \n \r \u + * @RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8 : Allow UTF-8 for printable U * + * @RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES: Must escape #x00-#x20<>\"{}|^` in URIs + * @RAPTOR_ESCAPED_WRITE_NTRIPLES_LITERAL: N-Triples literal + * @RAPTOR_ESCAPED_WRITE_NTRIPLES_URI: N-Triples URI + * @RAPTOR_ESCAPED_WRITE_SPARQL_LITERAL: SPARQL literal: allows raw UTF8 for printable literals + * @RAPTOR_ESCAPED_WRITE_SPARQL_LONG_LITERAL: SPARQL long literal: no BS-escapes allowed + * @RAPTOR_ESCAPED_WRITE_SPARQL_URI: SPARQL uri: have to escape certain characters + * @RAPTOR_ESCAPED_WRITE_TURTLE_URI: Turtle 2013 URIs (like SPARQL) + * @RAPTOR_ESCAPED_WRITE_TURTLE_LITERAL: Turtle 2013 literals (like SPARQL) + * @RAPTOR_ESCAPED_WRITE_TURTLE_LONG_LITERAL: Turtle 2013 long literals (like SPARQL) + * @RAPTOR_ESCAPED_WRITE_JSON_LITERAL: JSON literals: \b \f \t \r \n and \u \U + * + * Bit flags for raptor_string_escaped_write() and friends. + */ +typedef enum { + RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF = 1, + RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_TNRU = 2, + RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8 = 4, + RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES = 8, + + /* N-Triples - favour writing \u, \U over UTF8 */ + RAPTOR_ESCAPED_WRITE_NTRIPLES_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_TNRU | RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF, + RAPTOR_ESCAPED_WRITE_NTRIPLES_URI = RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES, + + /* SPARQL literal: allows raw UTF8 for printable literals */ + RAPTOR_ESCAPED_WRITE_SPARQL_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8, + + /* SPARQL long literal: no BS-escapes allowed */ + RAPTOR_ESCAPED_WRITE_SPARQL_LONG_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8, + + /* SPARQL uri: have to escape certain characters */ + RAPTOR_ESCAPED_WRITE_SPARQL_URI = RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8 | RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES, + + /* Turtle (2013) escapes are like SPARQL */ + RAPTOR_ESCAPED_WRITE_TURTLE_URI = RAPTOR_ESCAPED_WRITE_SPARQL_URI, + RAPTOR_ESCAPED_WRITE_TURTLE_LITERAL = RAPTOR_ESCAPED_WRITE_SPARQL_LITERAL, + RAPTOR_ESCAPED_WRITE_TURTLE_LONG_LITERAL = RAPTOR_ESCAPED_WRITE_SPARQL_LONG_LITERAL, + + /* JSON literals: \b \f \t \r \n and \u \U */ + RAPTOR_ESCAPED_WRITE_JSON_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_TNRU | RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF +} raptor_escaped_write_bitflags; + + +RAPTOR_API +int raptor_string_ntriples_write(const unsigned char *string, size_t len, const char delim, raptor_iostream *iostr); +RAPTOR_API +int raptor_bnodeid_ntriples_write(const unsigned char *bnodeid, size_t len, raptor_iostream *iostr); +RAPTOR_API RAPTOR_DEPRECATED +int raptor_string_python_write(const unsigned char *string, size_t len, const char delim, unsigned int mode, raptor_iostream *iostr); +RAPTOR_API +int raptor_statement_ntriples_write(const raptor_statement *statement, raptor_iostream* iostr, int write_graph_term); +RAPTOR_API +int raptor_string_escaped_write(const unsigned char *string, size_t len, const char delim, unsigned int flags, raptor_iostream *iostr); + + +/* Parser and Serializer options */ + +/** + * raptor_option_value_type: + * @RAPTOR_OPTION_VALUE_TYPE_BOOL: Boolean integer value. Non-0 is true + * @RAPTOR_OPTION_VALUE_TYPE_INT: Decimal integer value + * @RAPTOR_OPTION_VALUE_TYPE_STRING: String value + * @RAPTOR_OPTION_VALUE_TYPE_URI: URI String value. + * @RAPTOR_OPTION_VALUE_TYPE_LAST: internal + * + * Option value types. + */ +typedef enum { + RAPTOR_OPTION_VALUE_TYPE_BOOL, + RAPTOR_OPTION_VALUE_TYPE_INT, + RAPTOR_OPTION_VALUE_TYPE_STRING, + RAPTOR_OPTION_VALUE_TYPE_URI, + RAPTOR_OPTION_VALUE_TYPE_LAST = RAPTOR_OPTION_VALUE_TYPE_URI +} raptor_option_value_type; + + +/** + * raptor_option_description: + * @domain: domain ID + * @option: option ID + * @value_type: data type of option value + * @name: short name for option + * @name_len: length of @name + * @label: description of option + * @uri: URI identifying option + * + * Description of an option for a domain. + */ +typedef struct { + raptor_domain domain; + raptor_option option; + raptor_option_value_type value_type; + const char* name; + size_t name_len; + const char* label; + raptor_uri* uri; +} raptor_option_description; + + +RAPTOR_API +unsigned int raptor_option_get_count(void); +RAPTOR_API +const char* raptor_option_get_value_type_label(const raptor_option_value_type type); +RAPTOR_API +void raptor_free_option_description(raptor_option_description* option_description); +RAPTOR_API +raptor_option_description* raptor_world_get_option_description(raptor_world* world, const raptor_domain domain, const raptor_option option); + + +/* SAX2 element Class (raptor_xml_element) */ +RAPTOR_API +raptor_xml_element* raptor_new_xml_element(raptor_qname* name, const unsigned char* xml_language, raptor_uri* xml_base); +RAPTOR_API +raptor_xml_element* raptor_new_xml_element_from_namespace_local_name(raptor_namespace *ns, const unsigned char *name, const unsigned char *xml_language, raptor_uri *xml_base); +RAPTOR_API +void raptor_free_xml_element(raptor_xml_element *element); + +/* methods */ +RAPTOR_API +raptor_qname* raptor_xml_element_get_name(raptor_xml_element *xml_element); +RAPTOR_API +void raptor_xml_element_set_attributes(raptor_xml_element* xml_element, raptor_qname **attributes, int count); +RAPTOR_API +raptor_qname** raptor_xml_element_get_attributes(raptor_xml_element* xml_element); +RAPTOR_API +int raptor_xml_element_get_attributes_count(raptor_xml_element* xml_element); +RAPTOR_API +int raptor_xml_element_declare_namespace(raptor_xml_element* xml_element, raptor_namespace *nspace); +RAPTOR_API +int raptor_xml_element_write(raptor_xml_element *element, raptor_namespace_stack *nstack, int is_empty, int is_end, int depth, raptor_iostream *iostr); +RAPTOR_API +int raptor_xml_element_is_empty(raptor_xml_element* xml_element); +RAPTOR_API +const unsigned char* raptor_xml_element_get_language(raptor_xml_element* xml_element); + + +/* XML Writer Class (raptor_xml_writer) */ +RAPTOR_API +raptor_xml_writer* raptor_new_xml_writer(raptor_world* world, raptor_namespace_stack *nstack, raptor_iostream* iostr); +RAPTOR_API +void raptor_free_xml_writer(raptor_xml_writer* xml_writer); + +/* methods */ +RAPTOR_API +void raptor_xml_writer_empty_element(raptor_xml_writer* xml_writer, raptor_xml_element *element); +RAPTOR_API +void raptor_xml_writer_start_element(raptor_xml_writer* xml_writer, raptor_xml_element *element); +RAPTOR_API +void raptor_xml_writer_end_element(raptor_xml_writer* xml_writer, raptor_xml_element *element); +RAPTOR_API +void raptor_xml_writer_newline(raptor_xml_writer* xml_writer); +RAPTOR_API +void raptor_xml_writer_cdata(raptor_xml_writer* xml_writer, const unsigned char *s); +RAPTOR_API +void raptor_xml_writer_cdata_counted(raptor_xml_writer* xml_writer, const unsigned char *s, unsigned int len); +RAPTOR_API +void raptor_xml_writer_raw(raptor_xml_writer* xml_writer, const unsigned char *s); +RAPTOR_API +void raptor_xml_writer_raw_counted(raptor_xml_writer* xml_writer, const unsigned char *s, unsigned int len); +RAPTOR_API +void raptor_xml_writer_comment(raptor_xml_writer* xml_writer, const unsigned char *s); +RAPTOR_API +void raptor_xml_writer_comment_counted(raptor_xml_writer* xml_writer, const unsigned char *s, unsigned int len); +RAPTOR_API +void raptor_xml_writer_flush(raptor_xml_writer* xml_writer); +RAPTOR_API +int raptor_xml_writer_set_option(raptor_xml_writer *xml_writer, raptor_option option, char* string, int integer); +RAPTOR_API +int raptor_xml_writer_get_option(raptor_xml_writer *xml_writer, raptor_option option, char** string_p, int* integer_p); +RAPTOR_API +int raptor_xml_writer_get_depth(raptor_xml_writer *xml_writer); + +/** + * raptor_sax2_start_element_handler: + * @user_data: user data + * @xml_element: XML element + * + * SAX2 start element handler + */ +typedef void (*raptor_sax2_start_element_handler)(void *user_data, raptor_xml_element *xml_element); + +/** + * raptor_sax2_end_element_handler: + * @user_data: user data + * @xml_element: XML element + * + * SAX2 end element handler + */ +typedef void (*raptor_sax2_end_element_handler)(void *user_data, raptor_xml_element* xml_element); + +/** + * raptor_sax2_characters_handler: + * @user_data: user data + * @xml_element: XML element + * @s: string + * @len: string len + * + * SAX2 characters handler + */ +typedef void (*raptor_sax2_characters_handler)(void *user_data, raptor_xml_element* xml_element, const unsigned char *s, int len); + +/** + * raptor_sax2_cdata_handler: + * @user_data: user data + * @xml_element: XML element + * @s: string + * @len: string len + + * SAX2 CDATA section handler + */ +typedef void (*raptor_sax2_cdata_handler)(void *user_data, raptor_xml_element* xml_element, const unsigned char *s, int len); + +/** + * raptor_sax2_comment_handler: + * @user_data: user data + * @xml_element: XML element + * @s: string + * + * SAX2 XML comment handler + */ +typedef void (*raptor_sax2_comment_handler)(void *user_data, raptor_xml_element* xml_element, const unsigned char *s); + +/** + * raptor_sax2_unparsed_entity_decl_handler: + * @user_data: user data + * @entityName: entity name + * @base: base URI + * @systemId: system ID + * @publicId: public ID + * @notationName: notation name + * + * SAX2 unparsed entity (NDATA) handler + */ +typedef void (*raptor_sax2_unparsed_entity_decl_handler)(void *user_data, const unsigned char* entityName, const unsigned char* base, const unsigned char* systemId, const unsigned char* publicId, const unsigned char* notationName); + +/** + * raptor_sax2_external_entity_ref_handler: + * @user_data: user data + * @context: context + * @base: base URI + * @systemId: system ID + * @publicId: public ID + * + * SAX2 external entity reference handler + * + * Return value: 0 if processing should not continue because of a + * fatal error in the handling of the external entity. + */ +typedef int (*raptor_sax2_external_entity_ref_handler)(void *user_data, const unsigned char* context, const unsigned char* base, const unsigned char* systemId, const unsigned char* publicId); + + +/* SAX2 API */ +RAPTOR_API +raptor_sax2* raptor_new_sax2(raptor_world *world, raptor_locator *locator, void* user_data); +RAPTOR_API +void raptor_free_sax2(raptor_sax2 *sax2); + +/* methods */ +RAPTOR_API +void raptor_sax2_set_start_element_handler(raptor_sax2* sax2, raptor_sax2_start_element_handler handler); +RAPTOR_API +void raptor_sax2_set_end_element_handler(raptor_sax2* sax2, raptor_sax2_end_element_handler handler); +RAPTOR_API +void raptor_sax2_set_characters_handler(raptor_sax2* sax2, raptor_sax2_characters_handler handler); +RAPTOR_API +void raptor_sax2_set_cdata_handler(raptor_sax2* sax2, raptor_sax2_cdata_handler handler); +RAPTOR_API +void raptor_sax2_set_comment_handler(raptor_sax2* sax2, raptor_sax2_comment_handler handler); +RAPTOR_API +void raptor_sax2_set_unparsed_entity_decl_handler(raptor_sax2* sax2, raptor_sax2_unparsed_entity_decl_handler handler); +RAPTOR_API +void raptor_sax2_set_external_entity_ref_handler(raptor_sax2* sax2, raptor_sax2_external_entity_ref_handler handler); +RAPTOR_API +void raptor_sax2_set_namespace_handler(raptor_sax2* sax2, raptor_namespace_handler handler); +RAPTOR_API +void raptor_sax2_set_uri_filter(raptor_sax2* sax2, raptor_uri_filter_func filter, void *user_data); +RAPTOR_API +void raptor_sax2_parse_start(raptor_sax2 *sax2, raptor_uri *base_uri); +RAPTOR_API +int raptor_sax2_parse_chunk(raptor_sax2* sax2, const unsigned char *buffer, size_t len, int is_end); +RAPTOR_API +const unsigned char* raptor_sax2_inscope_xml_language(raptor_sax2* sax2); +RAPTOR_API +raptor_uri* raptor_sax2_inscope_base_uri(raptor_sax2* sax2); + + + +/* AVL Trees */ + +/** + * raptor_avltree: + * + * AVL Tree + */ +typedef struct raptor_avltree_s raptor_avltree; + +/** + * raptor_avltree_iterator: + * + * AVL Tree Iterator as created by raptor_new_avltree_iterator() + */ +typedef struct raptor_avltree_iterator_s raptor_avltree_iterator; + +/** + * raptor_avltree_visit_handler: + * @depth: depth of object in tree + * @data: data object being visited + * @user_data: user data arg to raptor_avltree_visit() + * + * AVL Tree visitor function as given to raptor_avltree_visit() + * + * Return value: non-0 to terminate visit early. + */ +typedef int (*raptor_avltree_visit_handler)(int depth, void* data, void *user_data); + + +/** + * raptor_avltree_bitflags: + * @RAPTOR_AVLTREE_FLAG_REPLACE_DUPLICATES: If set raptor_avltree_add() will replace any duplicate items. If not set, raptor_avltree_add() will not replace them and will return status >0 when adding a duplicate. (Default is not set) + * + * Bit flags for AVL Tree class constructor raptor_new_avltree() + **/ +typedef enum { + RAPTOR_AVLTREE_FLAG_REPLACE_DUPLICATES = 1 +} raptor_avltree_bitflags; + + +RAPTOR_API +raptor_avltree* raptor_new_avltree(raptor_data_compare_handler compare_handler, raptor_data_free_handler free_handler, unsigned int flags); +RAPTOR_API +void raptor_free_avltree(raptor_avltree* tree); + +/* methods */ +RAPTOR_API +int raptor_avltree_add(raptor_avltree* tree, void* p_data); +RAPTOR_API +void* raptor_avltree_remove(raptor_avltree* tree, void* p_data); +RAPTOR_API +int raptor_avltree_delete(raptor_avltree* tree, void* p_data); +RAPTOR_API +void* raptor_avltree_search(raptor_avltree* tree, const void* p_data); +RAPTOR_API +int raptor_avltree_visit(raptor_avltree* tree, raptor_avltree_visit_handler visit_handler, void* user_data); +RAPTOR_API +int raptor_avltree_size(raptor_avltree* tree); +RAPTOR_API +void raptor_avltree_set_print_handler(raptor_avltree* tree, raptor_data_print_handler print_handler); +RAPTOR_API +int raptor_avltree_print(raptor_avltree* tree, FILE* stream); + +RAPTOR_API +raptor_avltree_iterator* raptor_new_avltree_iterator(raptor_avltree* tree, void* range, raptor_data_free_handler range_free_handler, int direction); +RAPTOR_API +void raptor_free_avltree_iterator(raptor_avltree_iterator* iterator); + +RAPTOR_API +int raptor_avltree_iterator_is_end(raptor_avltree_iterator* iterator); +RAPTOR_API +int raptor_avltree_iterator_next(raptor_avltree_iterator* iterator); +RAPTOR_API +void* raptor_avltree_iterator_get(raptor_avltree_iterator* iterator); + +/* utility methods */ +RAPTOR_API +void raptor_sort_r(void *base, size_t nel, size_t width, raptor_data_compare_arg_handler compar, void *user_data); + + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/external/redland/raptor/raptor_config.h b/external/redland/raptor/raptor_config.h new file mode 100644 index 000000000..74f58de95 --- /dev/null +++ b/external/redland/raptor/raptor_config.h @@ -0,0 +1,402 @@ +/* src/raptor_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + +/* have to check C99 vsnprintf at runtime because cross compiling */ +#undef CHECK_VSNPRINTF_RUNTIME + +/* vsnprintf has C99 compatible return value */ +#undef HAVE_C99_VSNPRINTF + +/* Have curl/curl.h */ +#undef HAVE_CURL_CURL_H + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the <errno.h> header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the <fcntl.h> header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the <fetch.h> header file. */ +#undef HAVE_FETCH_H + +/* Define to 1 if you have the `getopt' function. */ +#undef HAVE_GETOPT + +/* Define to 1 if you have the <getopt.h> header file. */ +#undef HAVE_GETOPT_H + +/* Define to 1 if you have the `getopt_long' function. */ +#undef HAVE_GETOPT_LONG + +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + +/* INN parsedate function present */ +#undef HAVE_INN_PARSEDATE + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `isascii' function. */ +#undef HAVE_ISASCII + +/* Define to 1 if you have the <libxml/hash.h> header file. */ +#define HAVE_LIBXML_HASH_H 1 + +/* Define to 1 if you have the <libxml/HTMLparser.h> header file. */ +#define HAVE_LIBXML_HTMLPARSER_H 1 + +/* Define to 1 if you have the <libxml/nanohttp.h> header file. */ +#define HAVE_LIBXML_NANOHTTP_H 1 + +/* Define to 1 if you have the <libxml/parser.h> header file. */ +#define HAVE_LIBXML_PARSER_H 1 + +/* Define to 1 if you have the <libxml/SAX2.h> header file. */ +#define HAVE_LIBXML_SAX2_H 1 + +/* Define to 1 if you have the <libxslt/xslt.h> header file. */ +#define HAVE_LIBXSLT_XSLT_H 1 + +/* Define to 1 if you have the <limits.h> header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the <math.h> header file. */ +#define HAVE_MATH_H 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `qsort_r' function. */ +#undef HAVE_QSORT_R + +/* Define to 1 if you have the `qsort_s' function. */ +/* note: MSVC has qsort_s but the sort_r.h code uses advanced features like + * "inline" that MSVC 2013 doesn't understand; fortunately there's another + * level of fallback... */ +#undef HAVE_QSORT_S + +/* Raptor raptor_parse_date available */ +#undef HAVE_RAPTOR_PARSE_DATE + +/* Define to 1 if you have the `setjmp' function. */ +#undef HAVE_SETJMP + +/* Define to 1 if you have the <setjmp.h> header file. */ +#undef HAVE_SETJMP_H + +/* Define to 1 if you have the `stat' function. */ +#undef HAVE_STAT + +/* Define to 1 if you have the <stddef.h> header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `stricmp' function. */ +#define HAVE_STRICMP 1 + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strtok_r' function. */ +#undef HAVE_STRTOK_R + +/* Define to 1 if you have the <sys/param.h> header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/time.h> header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the `vasprintf' function. */ +#undef HAVE_VASPRINTF + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Flex version as a decimal */ +#define FLEX_VERSION_DECIMAL 20539 + +/* Define to 1 if you have the `xmlCtxtUseOptions' function. */ +#define HAVE_XMLCTXTUSEOPTIONS 1 + +/* Define to 1 if you have the `xmlSAX2InternalSubset' function. */ +#define HAVE_XMLSAX2INTERNALSUBSET 1 + +/* YAJL has API version 2 */ +#undef HAVE_YAJL2 + +/* Define to 1 if you have the <yajl/yajl_parse.h> header file. */ +#undef HAVE_YAJL_YAJL_PARSE_H + +/* Is __FUNCTION__ available */ +#define HAVE___FUNCTION__ 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* Define to 1 if maintainer mode is enabled. */ +#undef MAINTAINER_MODE + +/* need 'extern int optind' declaration? */ +#undef NEED_OPTIND_DECLARATION + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if debug messages are enabled. */ +#undef RAPTOR_DEBUG + +/* Use ICU for Unicode NFC check */ +#undef RAPTOR_ICU_NFC + +/* does libxml struct xmlEntity have a field etype */ +#define RAPTOR_LIBXML_ENTITY_ETYPE 1 + +/* does libxml struct xmlEntity have a field name_length */ +#undef RAPTOR_LIBXML_ENTITY_NAME_LENGTH + +/* does libxml have HTML_PARSE_NONET */ +#define RAPTOR_LIBXML_HTML_PARSE_NONET 1 + +/* does libxml xmlSAXHandler have externalSubset field */ +#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1 + +/* does libxml xmlSAXHandler have initialized field */ +#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1 + +/* does libxml have XML_PARSE_NONET */ +#define RAPTOR_LIBXML_XML_PARSE_NONET 1 + +/* Minimum supported package version */ +#define RAPTOR_MIN_VERSION_DECIMAL 20000 + +/* Building GRDDL parser */ +#undef RAPTOR_PARSER_GRDDL + +/* Building guess parser */ +#undef RAPTOR_PARSER_GUESS + +/* Building JSON parser */ +#undef RAPTOR_PARSER_JSON + +/* Building N-Quads parser */ +#undef RAPTOR_PARSER_NQUADS + +/* Building N-Triples parser */ +#define RAPTOR_PARSER_NTRIPLES 1 + +/* Building RDFA parser */ +#undef RAPTOR_PARSER_RDFA + +/* Building RDF/XML parser */ +#define RAPTOR_PARSER_RDFXML 1 + +/* Building RSS Tag Soup parser */ +#undef RAPTOR_PARSER_RSS + +/* Building TRiG parser */ +#undef RAPTOR_PARSER_TRIG + +/* Building Turtle parser */ +#undef RAPTOR_PARSER_TURTLE + +/* Building Atom 1.0 serializer */ +#undef RAPTOR_SERIALIZER_ATOM + +/* Building GraphViz DOT serializer */ +#undef RAPTOR_SERIALIZER_DOT + +/* Building HTML Table serializer */ +#undef RAPTOR_SERIALIZER_HTML + +/* Building JSON serializer */ +#undef RAPTOR_SERIALIZER_JSON + +/* Building N-Quads serializer */ +#undef RAPTOR_SERIALIZER_NQUADS + +/* Building N-Triples serializer */ +#define RAPTOR_SERIALIZER_NTRIPLES 1 + +/* Building RDF/XML serializer */ +#define RAPTOR_SERIALIZER_RDFXML 1 + +/* Building RDF/XML-abbreviated serializer */ +#define RAPTOR_SERIALIZER_RDFXML_ABBREV 1 + +/* Building RSS 1.0 serializer */ +#undef RAPTOR_SERIALIZER_RSS_1_0 + +/* Building Turtle serializer */ +#undef RAPTOR_SERIALIZER_TURTLE + +/* Release version as a decimal */ +#define RAPTOR_VERSION_DECIMAL 20015 + +/* Major version number */ +#define RAPTOR_VERSION_MAJOR 2 + +/* Minor version number */ +#define RAPTOR_VERSION_MINOR 0 + +/* Release version number */ +#define RAPTOR_VERSION_RELEASE 15 + +/* Have libcurl WWW library */ +#undef RAPTOR_WWW_LIBCURL + +/* Have libfetch WWW library */ +#undef RAPTOR_WWW_LIBFETCH + +/* Have libxml available as a WWW library */ +#undef RAPTOR_WWW_LIBXML + +/* No WWW library */ +#define RAPTOR_WWW_NONE + +/* Check XML 1.1 Names */ +#undef RAPTOR_XML_1_1 + +/* Use libxml XML parser */ +#define RAPTOR_XML_LIBXML 1 + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +#undef TIME_WITH_SYS_TIME + +/* Version number of package */ +#define VERSION "2.0.15" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif + +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#undef YYTEXT_POINTER + +/* Enable large inode numbers on macOS 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + +// from raptor_config_cmake.h.in //////////////////////////////////////////// + +#ifdef _WIN32 +# define WIN32_LEAN_AND_MEAN +# ifndef _CRT_NONSTDC_NO_DEPRECATE +# define _CRT_NONSTDC_NO_DEPRECATE +# endif +# ifndef _CRT_SECURE_NO_DEPRECATE +# define _CRT_SECURE_NO_DEPRECATE +# endif + +# ifdef _MSC_VER +# define __func__ __FUNCTION__ +# endif + +# define RAPTOR_INLINE __inline + +# define S_ISTYPE(mode, mask) (((mode) & _S_IFMT) == (mask)) +# define S_ISDIR(mode) S_ISTYPE((mode), _S_IFDIR) +# define S_ISREG(mode) S_ISTYPE((mode), _S_IFREG) + + /* Mode bits for access() */ +# define R_OK 04 +# define W_OK 02 + +# if !defined(HAVE_ACCESS) && defined(HAVE__ACCESS) +# define access(p,m) _access(p,m) +# endif +# ifndef HAVE_STRCASECMP +# if defined(HAVE__STRICMP) +# define strcasecmp(a,b) _stricmp(a,b) +# elif defined(HAVE_STRICMP) +# define strcasecmp(a,b) stricmp(a,b) +# endif +# endif +# if !defined(HAVE_SNPRINTF) && defined(HAVE__SNPRINTF) +# define snprintf _snprintf +# endif +# if !defined(HAVE_VSNPRINTF) && defined(HAVE__VSNPRINTF) +# define vsnprintf _vsnprintf +# endif + + /* These prevent parsedate.c from declaring malloc() and free() */ +# define YYMALLOC malloc +# define YYFREE free +#endif + + diff --git a/external/redland/raptor/rpath.patch b/external/redland/raptor/rpath.patch new file mode 100644 index 000000000..7863f61cd --- /dev/null +++ b/external/redland/raptor/rpath.patch @@ -0,0 +1,21 @@ +--- configure ++++ configure +@@ -9892,6 +9892,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd* | netbsdelf*-gnu) +--- utils/Makefile.in ++++ utils/Makefile.in +@@ -343,7 +343,7 @@ + rapper_LDADD = $(top_builddir)/src/libraptor2.la + rdfdiff_SOURCES = rdfdiff.c $(am__append_2) + rdfdiff_LDADD = $(top_builddir)/src/libraptor2.la +-all: all-am ++all: + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj diff --git a/external/redland/raptor/ubsan.patch b/external/redland/raptor/ubsan.patch new file mode 100644 index 000000000..641d60bb7 --- /dev/null +++ b/external/redland/raptor/ubsan.patch @@ -0,0 +1,25 @@ +--- src/raptor_rfc2396.c ++++ src/raptor_rfc2396.c +@@ -386,7 +386,7 @@ + } + + +- if(prev && s == (cur+2) && cur[0] == '.' && cur[1] == '.') { ++ if(prev && cur && s == (cur+2) && cur[0] == '.' && cur[1] == '.') { + /* Remove <component>/.. at the end of the path */ + *prev = '\0'; + path_len -= (s-prev); +--- src/raptor_uri.c ++++ src/raptor_uri.c +@@ -1336,9 +1336,9 @@ + !strncmp((const char*)base_detail->scheme, + (const char*)reference_detail->scheme, + base_detail->scheme_len) && +- !strncmp((const char*)base_detail->authority, ++ (base_detail->authority_len == 0 || !strncmp((const char*)base_detail->authority, + (const char*)reference_detail->authority, +- base_detail->authority_len)) { ++ base_detail->authority_len))) { + + if(!base_detail->path) { + if(reference_detail->path) { diff --git a/external/redland/raptor/xml2-config.patch b/external/redland/raptor/xml2-config.patch new file mode 100644 index 000000000..2550acee0 --- /dev/null +++ b/external/redland/raptor/xml2-config.patch @@ -0,0 +1,22 @@ +--- configure ++++ configure +@@ -14197,6 +14197,11 @@ + test -n "$XML_CONFIG" && break + done + ++ if test -n "$XML_CONFIG"; then ++ if ! "$XML_CONFIG" --version; then ++ XML_CONFIG= ++ fi ++ fi + fi + fi + +@@ -14481,6 +14481,7 @@ + + LIBXML_VERSION=`$PKG_CONFIG libxml-2.0 --modversion` + libxml_source="pkg-config" ++ XML_CONFIG="$PKG_CONFIG libxml-2.0" + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml via pkg-config" >&5 diff --git a/external/redland/rasqal/clang-cl.patch b/external/redland/rasqal/clang-cl.patch new file mode 100644 index 000000000..e35a2b4ee --- /dev/null +++ b/external/redland/rasqal/clang-cl.patch @@ -0,0 +1,11 @@ +--- src/rasqal.h ++++ src/rasqal.h +@@ -99,7 +99,7 @@ + /* Use gcc 3.1+ feature to allow marking of deprecated API calls. + * This gives a warning during compiling. + */ +-#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 ++#if (defined __GNUC__ && (( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3)) || defined __clang__ + #define RASQAL_DEPRECATED __attribute__((deprecated)) + #else + #define RASQAL_DEPRECATED diff --git a/external/redland/rasqal/libtool.patch b/external/redland/rasqal/libtool.patch new file mode 100644 index 000000000..b0baae661 --- /dev/null +++ b/external/redland/rasqal/libtool.patch @@ -0,0 +1,27 @@ +--- build/ltmain.sh ++++ build/ltmain.sh +@@ -5301,6 +5301,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -5639,6 +5645,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/external/redland/rasqal/rasqal-aix.patch.1 b/external/redland/rasqal/rasqal-aix.patch.1 new file mode 100644 index 000000000..d755aa2e5 --- /dev/null +++ b/external/redland/rasqal/rasqal-aix.patch.1 @@ -0,0 +1,25 @@ +--- a/src/rasqal_literal.c 2013-03-29 21:22:57.413852072 +0100 ++++ b/src/rasqal_literal.c 2013-03-29 21:23:34.092851757 +0100 +@@ -46,10 +46,22 @@ + #include <stddef.h> + #endif + #include <stdarg.h> ++#ifdef _AIX ++# ifndef isnan ++# define isnan(x) \ ++ (sizeof (x) == sizeof (long double) ? isnan_ld (x) \ ++ : sizeof (x) == sizeof (double) ? isnan_d (x) \ ++ : isnan_f (x)) ++ static inline int isnan_f (float x) { return x != x; } ++ static inline int isnan_d (double x) { return x != x; } ++ static inline int isnan_ld (long double x) { return x != x; } ++# endif ++#else + /* for isnan() */ + #ifdef HAVE_MATH_H + #include <math.h> + #endif ++#endif + /* for INT_MIN and INT_MAX */ + #ifdef HAVE_LIMITS_H + #include <limits.h> diff --git a/external/redland/rasqal/rasqal-android.patch.1 b/external/redland/rasqal/rasqal-android.patch.1 new file mode 100644 index 000000000..b14aa5758 --- /dev/null +++ b/external/redland/rasqal/rasqal-android.patch.1 @@ -0,0 +1,14 @@ +No sonames on Android + +--- a/configure 2013-03-29 19:46:34.922901756 +0100 ++++ b/configure 2013-03-29 19:46:56.051901574 +0100 +@@ -9809,7 +9809,7 @@ + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac +- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + diff --git a/external/redland/rasqal/rasqal-bundled-soname.patch.1 b/external/redland/rasqal/rasqal-bundled-soname.patch.1 new file mode 100644 index 000000000..2c674516d --- /dev/null +++ b/external/redland/rasqal/rasqal-bundled-soname.patch.1 @@ -0,0 +1,13 @@ +rhbz#809466 change soname of bundled redland libs + +--- a/src/Makefile.in 2013-03-29 21:44:58.115840724 +0100 ++++ b/src/Makefile.in 2013-03-29 21:45:01.252840697 +0100 +@@ -621,7 +621,7 @@ + $(am__append_2) $(am__append_3) $(am__append_4) \ + $(am__append_5) $(am__append_6) $(am__append_7) + nodist_librasqal_la_SOURCES = $(am__append_8) +-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ ++librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo + librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ \ + @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS) \ + $(top_builddir)/libsv/libsv.la $(am__append_10) diff --git a/external/redland/rasqal/rasqal-freebsd.patch.1 b/external/redland/rasqal/rasqal-freebsd.patch.1 new file mode 100644 index 000000000..349f3a197 --- /dev/null +++ b/external/redland/rasqal/rasqal-freebsd.patch.1 @@ -0,0 +1,28 @@ +Usual patch to produce Linux-like .so files on FreeBSD + +--- a/build/ltmain.sh 2008-02-02 22:28:24.000000000 +0900 ++++ b/build/ltmain.sh 2008-07-08 11:58:42.000000000 +0900 +@@ -7341,9 +7341,9 @@ + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|qnx|sunos) +- current="$number_major" +- revision="$number_minor" +- age="0" ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor +@@ -7420,8 +7420,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current" ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" + ;; + + irix | nonstopux) diff --git a/external/redland/rasqal/rasqal-msvc.patch.1 b/external/redland/rasqal/rasqal-msvc.patch.1 new file mode 100644 index 000000000..f32f6720b --- /dev/null +++ b/external/redland/rasqal/rasqal-msvc.patch.1 @@ -0,0 +1,64 @@ +diff -ru rasqal.orig/src/win32_rasqal_config.h rasqal/src/win32_rasqal_config.h +--- rasqal.orig/src/win32_rasqal_config.h 2015-09-02 23:12:00.733125322 +0200 ++++ rasqal/src/win32_rasqal_config.h 2015-09-02 23:28:10.152190403 +0200 +@@ -31,7 +31,6 @@ + /* MS names for these functions */ + // next line breaks build on wntmsci12 + //#define vsnprintf _vsnprintf +-#define snprintf _snprintf + #define access _access + #define stricmp _stricmp + #define strnicmp _strnicmp +@@ -42,10 +43,10 @@ + int rasqal_gettimeofday(struct timeval *tv, struct timezone *tz); + #undef HAVE_GETTIMEOFDAY + +-#include <float.h> +-#define isnan(n) _isnan(n) +-/* no round function available */ +-#define round(x) floor(x+0.5) ++// #include <float.h> ++// #define isnan(n) _isnan(n) ++// /* no round function available */ ++// #define round(x) floor(x+0.5) + + /* These are SPARQL token definitions */ + #ifdef OPTIONAL +--- rasqal/src/rasqal_ntriples.c.orig 2016-08-26 23:29:58.343472683 +0200 ++++ rasqal/src/rasqal_ntriples.c 2016-08-26 23:30:10.553471736 +0200 +@@ -25,6 +25,10 @@ + #include <rasqal_config.h> + #endif + ++#ifdef _WIN32 ++#include <win32_rasqal_config.h> ++#endif ++ + #include <stdio.h> + #include <string.h> + #include <ctype.h> +--- rasqal/src/sv_config.h.orig 2016-08-26 23:29:42.408473919 +0200 ++++ rasqal/src/sv_config.h 2016-08-26 23:29:44.760473737 +0200 +@@ -29,7 +29,11 @@ + extern "C" { + #endif + ++#ifdef _WIN32 ++#include <win32_rasqal_config.h> ++#else + #include <rasqal_config.h> ++#endif + + #define sv_new rasqal_sv_new + #define sv_free rasqal_sv_free +--- rasqal/src/rasqal.h.in.orig 2016-08-26 23:42:23.198414915 +0200 ++++ rasqal/src/rasqal.h.in 2016-08-26 23:42:34.627414028 +0200 +@@ -1473,7 +1473,7 @@ + + RASQAL_API + int rasqal_query_results_formats_check2(rasqal_world* world, const char *name, raptor_uri* uri, const char *mime_type, int flags); +-RASQAL_API RASQAL_API RASQAL_DEPRECATED ++RASQAL_API RASQAL_DEPRECATED + int rasqal_query_results_formats_check(rasqal_world* world, const char *name, raptor_uri* uri, const char *mime_type, int flags); + RASQAL_API + rasqal_query_results_formatter* rasqal_new_query_results_formatter(rasqal_world* world, const char *name, const char *mime_type, raptor_uri* format_uri); diff --git a/external/redland/rasqal/rasqal-pkgconfig.patch.1 b/external/redland/rasqal/rasqal-pkgconfig.patch.1 new file mode 100644 index 000000000..ac3eab07c --- /dev/null +++ b/external/redland/rasqal/rasqal-pkgconfig.patch.1 @@ -0,0 +1,14 @@ +Let the pkg-config stuff be overridden by variables + +--- a/configure ++++ b/configure +@@ -14119,7 +14119,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +- RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null` ++ RAPTOR_VERSION=2.0.15 + raptor_too_old=0 + as_arg_v1=$RAPTOR_VERSION + as_arg_v2=$RAPTOR_MIN_VERSION + diff --git a/external/redland/rasqal/rasqal-xcompile.patch.1 b/external/redland/rasqal/rasqal-xcompile.patch.1 new file mode 100644 index 000000000..65efc3047 --- /dev/null +++ b/external/redland/rasqal/rasqal-xcompile.patch.1 @@ -0,0 +1,16 @@ +No point in creating util or test executables when cross-compiling. +(Especially as doing it anyway wouldn't work without tweaks to have it find +libxml2 and libm, at least for Android.) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -358,7 +358,7 @@ + top_srcdir = @top_srcdir@ + noinst_SCRIPTS = rasqal-src-config + ACLOCAL_AMFLAGS = -I build +-SUBDIRS = libsv $(am__append_1) $(am__append_2) src utils tests docs \ ++SUBDIRS = libsv $(am__append_1) $(am__append_2) src docs \ + data win32 scripts + DIST_SUBDIRS = libsv libmtwist getopt src utils tests docs data win32 scripts + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = rasqal.pc diff --git a/external/redland/rasqal/rasqal.h b/external/redland/rasqal/rasqal.h new file mode 100644 index 000000000..cd5d64604 --- /dev/null +++ b/external/redland/rasqal/rasqal.h @@ -0,0 +1,2259 @@ +/* -*- Mode: c; c-basic-offset: 2 -*- + * + * rasqal.h - Rasqal RDF Query library interfaces and definition + * + * Copyright (C) 2003-2010, David Beckett http://www.dajobe.org/ + * Copyright (C) 2003-2005, University of Bristol, UK http://www.bristol.ac.uk/ + * + * This package is Free Software and part of Redland http://librdf.org/ + * + * It is licensed under the following three licenses as alternatives: + * 1. GNU Lesser General Public License (LGPL) V2.1 or any newer version + * 2. GNU General Public License (GPL) V2 or any newer version + * 3. Apache License, V2.0 or any newer version + * + * You may not use this file except in compliance with at least one of + * the above three licenses. + * + * See LICENSE.html or LICENSE.txt at the top of this package for the + * complete terms and further detail along with the license texts for + * the licenses in COPYING.LIB, COPYING and LICENSE-2.0.txt respectively. + * + */ + + + +#ifndef RASQAL_H +#define RASQAL_H + + +#ifdef __cplusplus +extern "C" { +#endif + + +/** + * RASQAL_VERSION: + * + * Rasqal library version number + * + * Format: major * 10000 + minor * 100 + release + */ +#define RASQAL_VERSION 933 + +/** + * RASQAL_VERSION_STRING: + * + * Rasqal library version string + */ +#define RASQAL_VERSION_STRING "0.9.33" + +/** + * RASQAL_VERSION_MAJOR: + * + * Rasqal library major version + */ +#define RASQAL_VERSION_MAJOR 0 + +/** + * RASQAL_VERSION_MINOR: + * + * Rasqal library minor version + */ +#define RASQAL_VERSION_MINOR 9 + +/** + * RASQAL_VERSION_RELEASE: + * + * Rasqal library release + */ +#define RASQAL_VERSION_RELEASE 33 + + +/** + * RASQAL_API: + * + * Macro for wrapping API function call declarations. + * + */ +#ifndef RASQAL_API +# ifdef _WIN32 +# ifdef __GNUC__ +# undef _declspec +# define _declspec(x) __declspec(x) +# endif +# ifdef RASQAL_STATIC +# define RASQAL_API +# else +# ifdef RASQAL_INTERNAL +# define RASQAL_API _declspec(dllexport) +# else +# define RASQAL_API _declspec(dllimport) +# endif +# endif +# else +# define RASQAL_API +# endif +#endif + +/* Use gcc 3.1+ feature to allow marking of deprecated API calls. + * This gives a warning during compiling. + */ +#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 +#define RASQAL_DEPRECATED __attribute__((deprecated)) +#else +#define RASQAL_DEPRECATED +#endif + + +#ifndef LIBRDF_OBJC_FRAMEWORK +#include <raptor.h> +#else +#include <Redland/raptor.h> +#endif + +#if 0 +#include <sys/time.h> +#endif +#if 1 +#include <time.h> +#endif + +/* Public statics */ + +/** + * rasqal_short_copyright_string: + * + * Short copyright string (one line). + */ +RASQAL_API +extern const char * const rasqal_short_copyright_string; + +/** + * rasqal_copyright_string: + * + * Copyright string (multiple lines). + */ +RASQAL_API +extern const char * const rasqal_copyright_string; + +/** + * rasqal_version_string: + * + * Rasqal version as a string. + */ +RASQAL_API +extern const char * const rasqal_version_string; + +/** + * rasqal_version_major: + * + * Rasqal major version number. + */ +RASQAL_API +extern const unsigned int rasqal_version_major; + +/** + * rasqal_version_minor: + * + * Rasqal minor version number. + */ +RASQAL_API +extern const unsigned int rasqal_version_minor; + +/** + * rasqal_version_release: + * + * Rasqal release version number. + */ +RASQAL_API +extern const unsigned int rasqal_version_release; + +/** + * rasqal_version_decimal: + * + * Rasqal version as a decimal number. + * + * Format: major * 10000 + minor * 100 + release + */ +RASQAL_API +extern const unsigned int rasqal_version_decimal; + +/** + * rasqal_license_string: + * + * Rasqal license string. + */ +RASQAL_API +extern const char * const rasqal_license_string; + +/** + * rasqal_home_url_string: + * + * Rasqal home page URL. + */ +RASQAL_API +extern const char * const rasqal_home_url_string; + + + +/** + * RASQAL_RAPTOR_VERSION: + * + * Version of Raptor that Rasqal was configured against. + */ +#define RASQAL_RAPTOR_VERSION 20015 + + +/* Public structures */ + +#ifndef RASQAL_WORLD_DECLARED +#define RASQAL_WORLD_DECLARED 1 +/** + * rasqal_world: + * + * Rasqal world class. + */ +typedef struct rasqal_world_s rasqal_world; +#endif + +/** + * rasqal_query: + * + * Rasqal query class. + */ +typedef struct rasqal_query_s rasqal_query; + +/** + * rasqal_query_results: + * + * Rasqal query results class. + */ +typedef struct rasqal_query_results_s rasqal_query_results; + + +#ifndef RASQAL_QUERY_RESULTS_FORMATTER_DECLARED +#define RASQAL_QUERY_RESULTS_FORMATTER_DECLARED 1 +/** + * rasqal_query_results_formatter: + * + * Rasqal query results formatter class. + */ +typedef struct rasqal_query_results_formatter_s rasqal_query_results_formatter; +#endif + + +typedef struct rasqal_literal_s rasqal_literal; + +/** + * rasqal_graph_pattern: + * + * Rasqal graph pattern class. + */ +typedef struct rasqal_graph_pattern_s rasqal_graph_pattern; + + +/** + * rasqal_variables_table: + * + * Rasqal variables table class. + */ +typedef struct rasqal_variables_table_s rasqal_variables_table; + + +/** + * rasqal_feature: + * @RASQAL_FEATURE_NO_NET: Deny network requests. + * @RASQAL_FEATURE_RAND_SEED: Set rand() / rand_r() seed + * @RASQAL_FEATURE_LAST: Internal. + * + * Query features. + * + * None currently defined. + */ +typedef enum { + RASQAL_FEATURE_NO_NET, + RASQAL_FEATURE_RAND_SEED, + RASQAL_FEATURE_LAST = RASQAL_FEATURE_RAND_SEED +} rasqal_feature; + + +/** + * rasqal_prefix: + * @world: rasqal_world object + * @prefix: short prefix string + * @uri: URI associated with the prefix. + * @declared: Internal flag. + * @depth: Internal flag. + * + * Namespace (prefix, uri) pair. + * + * Includes internal flags used for marking when prefixes are + * declared and at what XML element depth when used in XML formats. + */ +typedef struct { + rasqal_world* world; + const unsigned char *prefix; + raptor_uri* uri; + int declared; + int depth; +} rasqal_prefix; + + +/** + * rasqal_variable_type: + * @RASQAL_VARIABLE_TYPE_NORMAL: The regular variable type. + * @RASQAL_VARIABLE_TYPE_ANONYMOUS: Anonymous variable type. + * @RASQAL_VARIABLE_TYPE_UNKNOWN: Internal. + * + * Rasqal variable types. + * + * ANONYMOUS can be used in queries but cannot be returned in a + * result. + */ +typedef enum { + RASQAL_VARIABLE_TYPE_UNKNOWN = 0, + RASQAL_VARIABLE_TYPE_NORMAL = 1, + RASQAL_VARIABLE_TYPE_ANONYMOUS = 2 +} rasqal_variable_type; + + +/* forward reference */ +struct rasqal_expression_s; + +/** + * rasqal_variable: + * @vars_table: variables table that owns this variable + * @name: Variable name. + * @value: Variable value or NULL if unbound. + * @offset: Internal. + * @type: Variable type. + * @expression: Expression when the variable is a computed SELECT expression + * @user_data: Pointer to user data associated with a variable. This is not used by rasqal. + * @usage: reference count + * + * Binding between a variable name and a value. + * + * Includes internal field @offset for recording the offset into the + * (internal) rasqal_query variables array. + */ +typedef struct { + rasqal_variables_table* vars_table; + const unsigned char *name; + rasqal_literal* value; + int offset; + rasqal_variable_type type; + struct rasqal_expression_s* expression; + void *user_data; + int usage; +} rasqal_variable; + + +/** + * rasqal_data_graph_flags: + * @RASQAL_DATA_GRAPH_NONE: Internal. + * @RASQAL_DATA_GRAPH_NAMED: Graphs with a source and name. + * @RASQAL_DATA_GRAPH_BACKGROUND: Graphs with a source only. + * + * Flags for the type of #rasqal_data_graph. + * + * These are used by rasqal_new_data_graph_from_uri() and + * rasqal_new_data_graph_from_iostream(). See #rasqal_data_graph. + */ +typedef enum { + RASQAL_DATA_GRAPH_NONE = 0, + RASQAL_DATA_GRAPH_NAMED = 1, + RASQAL_DATA_GRAPH_BACKGROUND = 2 +} rasqal_data_graph_flags; + + +/** + * rasqal_data_graph: + * @world: rasqal_world object + * @uri: source URI + * @name_uri: name of graph for %RASQAL_DATA_GRAPH_NAMED + * @flags: %RASQAL_DATA_GRAPH_NAMED or %RASQAL_DATA_GRAPH_BACKGROUND + * @format_type: MIME Type of data format at @uri (or NULL) + * @format_name: Raptor parser Name of data format at @uri (or NULL) + * @format_uri: URI of data format at @uri (or NULL) + * @iostr: Raptor iostream for content, overriding @uri if present (or NULL) + * @base_uri: base URI for reading from iostream + * @usage: usage count of this object + * + * A source of RDF data for querying. + * + * If @iostr is present, the graph can be constructed by parsing the + * iostream and using @base_uri as a base uri. Otherwise the graph + * can be constructed from the graph at URI @uri. + * + * In either case the @name_uri is the graph name as long as @flags + * is %RASQAL_DATA_GRAPH_NAMED + */ +typedef struct { + rasqal_world* world; + raptor_uri* uri; + raptor_uri* name_uri; + unsigned int flags; + char* format_type; + char* format_name; + raptor_uri* format_uri; + raptor_iostream* iostr; + raptor_uri* base_uri; + int usage; +} rasqal_data_graph; + + +/** + * rasqal_literal_type: + * @RASQAL_LITERAL_BLANK: RDF blank node literal (SPARQL r:bNode) + * @RASQAL_LITERAL_URI: RDF URI Literal (SPARQL r:URI) + * @RASQAL_LITERAL_STRING: RDF Plain Literal - no datatype (SPARQL r:Literal) + * @RASQAL_LITERAL_XSD_STRING: String xsd:string + * @RASQAL_LITERAL_BOOLEAN: Boolean literal xsd:boolean. + * @RASQAL_LITERAL_INTEGER: Integer literal xsd:integer. + * @RASQAL_LITERAL_DOUBLE: Double floating point literal xsd:double. + * @RASQAL_LITERAL_FLOAT: Floating point literal xsd:float. + * @RASQAL_LITERAL_DECIMAL: Decimal integer xsd:decimal. + * @RASQAL_LITERAL_DATETIME: Date/Time literal xsd:dateTime. + * @RASQAL_LITERAL_UDT: User defined typed literal with unknown datatype URI + * @RASQAL_LITERAL_PATTERN: Pattern literal for a regex. + * @RASQAL_LITERAL_QNAME: XML Qname literal. + * @RASQAL_LITERAL_VARIABLE: Variable literal. + * @RASQAL_LITERAL_DATE: Date literal xsd:date. + * @RASQAL_LITERAL_INTEGER_SUBTYPE: Internal. + * @RASQAL_LITERAL_UNKNOWN: Internal. + * @RASQAL_LITERAL_FIRST_XSD: Internal. + * @RASQAL_LITERAL_LAST_XSD: Internal. + * @RASQAL_LITERAL_LAST: Internal. + * + * Types of literal. + * + * The order in the enumeration is significant as it encodes + * the SPARQL term ordering conditions: + * + * Blank Nodes << IRIs << RDF literals << typed literals + * + * which coresponds to in enum values + * + * BLANK << URI << STRING << + * (BOOLEAN | INTEGER | DOUBLE | FLOAT | DECIMAL | DATETIME | XSD_STRING) + * + * (RASQAL_LITERAL_FIRST_XSD ... RASQAL_LITERAL_LAST_XSD) + * + * Not used (internal): PATTERN, QNAME, VARIABLE + * + * See rasqal_literal_compare() when used with flags + * %RASQAL_COMPARE_XQUERY + */ +typedef enum { + /* internal */ + RASQAL_LITERAL_UNKNOWN, + RASQAL_LITERAL_BLANK, + RASQAL_LITERAL_URI, + RASQAL_LITERAL_STRING, + RASQAL_LITERAL_XSD_STRING, + RASQAL_LITERAL_BOOLEAN, + RASQAL_LITERAL_INTEGER, + RASQAL_LITERAL_FLOAT, + RASQAL_LITERAL_DOUBLE, + RASQAL_LITERAL_DECIMAL, + RASQAL_LITERAL_DATETIME, + /* internal */ + RASQAL_LITERAL_FIRST_XSD = RASQAL_LITERAL_XSD_STRING, + /* internal */ + RASQAL_LITERAL_LAST_XSD = RASQAL_LITERAL_DATETIME, + RASQAL_LITERAL_UDT, + RASQAL_LITERAL_PATTERN, + RASQAL_LITERAL_QNAME, + RASQAL_LITERAL_VARIABLE, + /* internal */ + RASQAL_LITERAL_INTEGER_SUBTYPE, + RASQAL_LITERAL_DATE, + /* internal */ + RASQAL_LITERAL_LAST = RASQAL_LITERAL_DATE +} rasqal_literal_type; + +#define RASQAL_LITERAL_UDT_DEFINED 1 + + +/** + * rasqal_row: + * + * Rasqal Result Row class. + */ +typedef struct rasqal_row_s rasqal_row; + + +/** + * rasqal_xsd_decimal: + * + * Rasqal XSD Decimal class. + */ +typedef struct rasqal_xsd_decimal_s rasqal_xsd_decimal; + + +/** + * RASQAL_XSD_DATETIME_NO_TZ: + * + * Sentinel XSD Decimal timezone value indicating no timezone is present. + */ +#define RASQAL_XSD_DATETIME_NO_TZ (9999) + +/** + * rasqal_xsd_date: + * @year: year + * @month: month 1-12 + * @day: 1-31 + * @timezone_minutes: minutes +/- against UTC or RASQAL_XSD_DATETIME_NO_TZ if there is no timezone in the dateTime. + * @time_on_timeline: time on timeline of first instant of date in timezone + * @have_tz: timezone flag: 'Z' if Zulu, 'Y' if has other timezone offset in @timezone_minutes, 'N' if there is no timezone + * + * XML schema date datatype (xsd:date) + * + * Examples of timezone fields: + * "2010-01-02" : timezone_minutes RASQAL_XSD_DATETIME_NO_TZ, have_tz 'N' + * "2010-01-02Z" : timezone_minutes 0, have_tz 'Z' + * "2010-01-02+00:00" : timezone_minutes 0, have_tz 'Y' + * "2010-01-02-01:00" : timezone_minutes -60, have_tz 'Y' + */ +typedef struct { + signed int year; + /* the following fields are integer values not characters */ + unsigned char month; + unsigned char day; + signed short timezone_minutes; + time_t time_on_timeline; + char have_tz; +} rasqal_xsd_date; + + +/** + * rasqal_xsd_datetime: + * @year: year + * @month: month 1-12 + * @day: 1-31 + * @hour: hour 0-23 + * @minute: minute 0-59 + * @second: second 0-60 (yes 60 is allowed for leap seconds) + * @microseconds: microseconds + * @timezone_minutes: minutes +/- against UTC or RASQAL_XSD_DATETIME_NO_TZ if there is no timezone in the dateTime. + * @time_on_timeline: time on timeline + * @have_tz: timezone flag: 'Z' if Zulu, 'Y' if has other timezone offset in @timezone_minutes, 'N' if there is no timezone + * + * XML Schema dateTime datatype (xsd:dateTime) + * + * Signed types are required for normalization process where a value + * can be negative temporarily. + * + * Examples of timezone fields: + * "2010-01-02T01:02:03" : timezone_minutes RASQAL_XSD_DATETIME_NO_TZ, have_tz 'N' + * "2010-01-02T01:02:03Z" : timezone_minutes 0, have_tz 'Z' + * "2010-01-02T01:02:03+00:00" : timezone_minutes 0, have_tz 'Y' + * "2010-01-02T01:02:03-01:00" : timezone_minutes -60, have_tz 'Y' + */ +typedef struct { + signed int year; + unsigned char month; + unsigned char day; + /* the following fields are integer values not characters */ + signed char hour; + signed char minute; + signed char second; + signed int microseconds; + signed short timezone_minutes; + time_t time_on_timeline; + char have_tz; +} rasqal_xsd_datetime; + + +/** + * rasqal_literal: + * @world: world object pointer + * @usage: Usage count. + * @type: Type of literal. + * @string: String form of literal for literal types UTF-8 string, pattern, qname, blank, double, float, decimal, datetime. + * @string_len: Length of @string. + * @value: Alternate value content. + * @language: Language for string literal type. + * @datatype: Datatype for string literal type. + * @flags: Flags for literal types + * @parent_type: parent XSD type if any or RASQAL_LITERAL_UNKNOWN + * @valid: >0 if literal format is a valid lexical form for this datatype. 0 if not valid. <0 if this has not been checked yet + * + * Rasqal literal class. + * + */ +struct rasqal_literal_s { + rasqal_world *world; + + int usage; + + rasqal_literal_type type; + + /* UTF-8 string, pattern, qname, blank, double, float, decimal, datetime */ + const unsigned char *string; + unsigned int string_len; + + union { + /* integer and boolean types */ + int integer; + /* double and float */ + double floating; + /* uri (can be temporarily NULL if a qname, see flags below) */ + raptor_uri* uri; + /* variable */ + rasqal_variable* variable; + /* decimal */ + rasqal_xsd_decimal* decimal; + /* datetime */ + rasqal_xsd_datetime* datetime; + /* date */ + rasqal_xsd_date* date; + } value; + + /* for string */ + char *language; + raptor_uri *datatype; + + /* various flags for literal types: + * pattern regex flags + * string datatype of qname + * uri qname of URI not yet expanded (temporary) + */ + const unsigned char *flags; + + rasqal_literal_type parent_type; + + int valid; +}; + + +/** + * rasqal_op: + * @RASQAL_EXPR_AND: Expression for AND(A, B) + * @RASQAL_EXPR_OR: Expression for OR(A, B) + * @RASQAL_EXPR_EQ: Expression for A equals B + * @RASQAL_EXPR_NEQ: Expression for A not equals B. + * @RASQAL_EXPR_LT: Expression for A less than B. + * @RASQAL_EXPR_GT: Expression for A greather than B. + * @RASQAL_EXPR_LE: Expression for A less than or equal to B. + * @RASQAL_EXPR_GE: Expression for A greater than or equal to B. + * @RASQAL_EXPR_UMINUS: Expression for -A. + * @RASQAL_EXPR_PLUS: Expression for +A. + * @RASQAL_EXPR_MINUS: Expression for A-B. + * @RASQAL_EXPR_STAR: Expression for A*B. + * @RASQAL_EXPR_SLASH: Expression for A/B. + * @RASQAL_EXPR_REM: Expression for A/B remainder. + * @RASQAL_EXPR_STR_EQ: Expression for A string equals B. + * @RASQAL_EXPR_STR_NEQ: Expression for A string not-equals B. + * @RASQAL_EXPR_STR_MATCH: Expression for string A matches literal regex B with flags. + * @RASQAL_EXPR_STR_NMATCH: Expression for string A not-matches literal regex B with flags. + * @RASQAL_EXPR_REGEX: Expression for string A matches expression regex B with flags. + * @RASQAL_EXPR_TILDE: Expression for binary not A. + * @RASQAL_EXPR_BANG: Expression for logical not A. + * @RASQAL_EXPR_LITERAL: Expression for a #rasqal_literal. + * @RASQAL_EXPR_FUNCTION: Expression for a function A with arguments (B...). + * @RASQAL_EXPR_BOUND: Expression for SPARQL ISBOUND(A). + * @RASQAL_EXPR_STR: Expression for SPARQL STR(A). + * @RASQAL_EXPR_LANG: Expression for SPARQL LANG(A). + * @RASQAL_EXPR_LANGMATCHES: Expression for SPARQL LANGMATCHES(A, B). + * @RASQAL_EXPR_DATATYPE: Expression for SPARQL DATATYPE(A). + * @RASQAL_EXPR_ISURI: Expression for SPARQL ISURI(A). + * @RASQAL_EXPR_ISBLANK: Expression for SPARQL ISBLANK(A). + * @RASQAL_EXPR_ISLITERAL: Expression for SPARQL ISLITERAL(A). + * @RASQAL_EXPR_CAST: Expression for cast literal A to type B. + * @RASQAL_EXPR_ORDER_COND_ASC: Expression for SPARQL order condition ascending. + * @RASQAL_EXPR_ORDER_COND_DESC: Expression for SPARQL order condition descending. + * @RASQAL_EXPR_GROUP_COND_ASC: Obsolete - not used + * @RASQAL_EXPR_GROUP_COND_DESC: Obsolete - not used + * @RASQAL_EXPR_COUNT: Expression for LAQRS select COUNT() aggregate function + * @RASQAL_EXPR_VARSTAR: Expression for LAQRS select Variable * + * @RASQAL_EXPR_SAMETERM: Expression for SPARQL sameTerm + * @RASQAL_EXPR_SUM: Expression for LAQRS select SUM() aggregate function + * @RASQAL_EXPR_AVG: Expression for LAQRS select AVG() aggregate function + * @RASQAL_EXPR_MIN: Expression for LAQRS select MIN() aggregate function + * @RASQAL_EXPR_MAX: Expression for LAQRS select MAX() aggregate function + * @RASQAL_EXPR_COALESCE: Expression for LAQRS COALESCE(Expr+) + * @RASQAL_EXPR_IF: Expression for LAQRS IF(expr, expr, expr) + * @RASQAL_EXPR_URI: Expression for LAQRS URI(expr) + * @RASQAL_EXPR_IRI: Expression for LAQRS IRI(expr) + * @RASQAL_EXPR_STRLANG: Expression for LAQRS STRLANG(expr, expr) + * @RASQAL_EXPR_STRDT: Expression for LAQRS STRDT(expr, expr) + * @RASQAL_EXPR_BNODE: Expression for LAQRS BNODE() and BNODE(expr) + * @RASQAL_EXPR_GROUP_CONCAT: Expression for LAQRS GROUP_CONCAT(arglist) aggregate function + * @RASQAL_EXPR_SAMPLE: Expression for LAQRS SAMPLE(expr) aggregate function + * @RASQAL_EXPR_IN: Expression for LAQRS expr IN ( list of expr ) + * @RASQAL_EXPR_NOT_IN: Expression for LAQRS expr NOT IN ( list of expr ) + * @RASQAL_EXPR_ISNUMERIC: Expression for SPARQL 1.1 isNUMERIC(expr) + * @RASQAL_EXPR_YEAR: Expression for SPARQL 1.1 YEAR(datetime) + * @RASQAL_EXPR_MONTH: Expression for SPARQL 1.1 MONTH(datetime) + * @RASQAL_EXPR_DAY: Expression for SPARQL 1.1 DAY(datetime) + * @RASQAL_EXPR_HOURS: Expression for SPARQL 1.1 HOURS(datetime) + * @RASQAL_EXPR_MINUTES: Expression for SPARQL 1.1 MINUTES(datetime) + * @RASQAL_EXPR_SECONDS: Expression for SPARQL 1.1 SECONDS(datetime) + * @RASQAL_EXPR_TIMEZONE: Expression for SPARQL 1.1 TIMEZONE(datetime) + * @RASQAL_EXPR_CURRENT_DATETIME: Expression for LAQRS CURRENT_DATETIME( void ) + * @RASQAL_EXPR_NOW: Expression for LAQRS NOW( void ) + * @RASQAL_EXPR_FROM_UNIXTIME: Expression for LAQRS FROM_UNIXTIME(int) + * @RASQAL_EXPR_TO_UNIXTIME: Expression for LAQRS TO_UNIXTIME(datetime) + * @RASQAL_EXPR_CONCAT: Expression for SPARQL 1.1 CONCAT(strings) + * @RASQAL_EXPR_STRLEN: Expression for SPARQL 1.1 STRLEN(str) + * @RASQAL_EXPR_SUBSTR: Expression for SPARQL 1.1 SUBSTR(str, start[,offset]) + * @RASQAL_EXPR_UCASE: Expression for SPARQL 1.1 UCASE(str) + * @RASQAL_EXPR_LCASE: Expression for SPARQL 1.1 LCASE(str) + * @RASQAL_EXPR_STRSTARTS: Expression for SPARQL 1.1 STRSTARTS(str, str) + * @RASQAL_EXPR_STRENDS: Expression for SPARQL 1.1 STRENDS(str, str) + * @RASQAL_EXPR_CONTAINS: Expression for SPARQL 1.1 CONTAINS(str, str) + * @RASQAL_EXPR_ENCODE_FOR_URI: Expression for SPARQL 1.1 ENCODE_FOR_URI(str) + * @RASQAL_EXPR_TZ: Expression for SPARQL 1.1 TZ() + * @RASQAL_EXPR_RAND: Expression for SPARQL 1.1 RAND() + * @RASQAL_EXPR_ABS: Expression for SPARQL 1.1 ABS() + * @RASQAL_EXPR_ROUND: Expression for SPARQL 1.1 ROUND() + * @RASQAL_EXPR_CEIL: Expression for SPARQL 1.1 CEIL() + * @RASQAL_EXPR_FLOOR: Expression for SPARQL 1.1 FLOOR() + * @RASQAL_EXPR_MD5: Expression for SPARQL 1.1 MD5() + * @RASQAL_EXPR_SHA1: Expression for SPARQL 1.1 SHA1() + * @RASQAL_EXPR_SHA224: Expression for SPARQL 1.1 SHA224() + * @RASQAL_EXPR_SHA256: Expression for SPARQL 1.1 SHA256() + * @RASQAL_EXPR_SHA384: Expression for SPARQL 1.1 SHA384() + * @RASQAL_EXPR_SHA512: Expression for SPARQL 1.1 SHA512() + * @RASQAL_EXPR_STRBEFORE: Expression for SPARQL 1.1 STRBEFORE() + * @RASQAL_EXPR_STRAFTER: Expression for SPARQL 1.1 STRAFTER() + * @RASQAL_EXPR_REPLACE: Expression for SPARQL 1.1 REPLACE() + * @RASQAL_EXPR_UUID: Expression for SPARQL 1.1 UUID() + * @RASQAL_EXPR_STRUUID: Expression for SPARQL 1.1 STRUUID() + * @RASQAL_EXPR_UNKNOWN: Internal + * @RASQAL_EXPR_LAST: Internal + * + * Rasqal expression operators. A mixture of unary, binary and + * tertiary operators (string matches). Also includes casting and + * two ordering operators from ORDER BY in SPARQL. + */ +typedef enum { + /* internal */ + RASQAL_EXPR_UNKNOWN, + RASQAL_EXPR_AND, + RASQAL_EXPR_OR, + RASQAL_EXPR_EQ, + RASQAL_EXPR_NEQ, + RASQAL_EXPR_LT, + RASQAL_EXPR_GT, + RASQAL_EXPR_LE, + RASQAL_EXPR_GE, + RASQAL_EXPR_UMINUS, + RASQAL_EXPR_PLUS, + RASQAL_EXPR_MINUS, + RASQAL_EXPR_STAR, + RASQAL_EXPR_SLASH, + RASQAL_EXPR_REM, + RASQAL_EXPR_STR_EQ, + RASQAL_EXPR_STR_NEQ, + RASQAL_EXPR_STR_MATCH, + RASQAL_EXPR_STR_NMATCH, + RASQAL_EXPR_TILDE, + RASQAL_EXPR_BANG, + RASQAL_EXPR_LITERAL, + RASQAL_EXPR_FUNCTION, + RASQAL_EXPR_BOUND, + RASQAL_EXPR_STR, + RASQAL_EXPR_LANG, + RASQAL_EXPR_DATATYPE, + RASQAL_EXPR_ISURI, + RASQAL_EXPR_ISBLANK, + RASQAL_EXPR_ISLITERAL, + RASQAL_EXPR_CAST, + RASQAL_EXPR_ORDER_COND_ASC, + RASQAL_EXPR_ORDER_COND_DESC, + RASQAL_EXPR_LANGMATCHES, + RASQAL_EXPR_REGEX, + RASQAL_EXPR_GROUP_COND_ASC, + RASQAL_EXPR_GROUP_COND_DESC, + RASQAL_EXPR_COUNT, + RASQAL_EXPR_VARSTAR, + RASQAL_EXPR_SAMETERM, + RASQAL_EXPR_SUM, + RASQAL_EXPR_AVG, + RASQAL_EXPR_MIN, + RASQAL_EXPR_MAX, + RASQAL_EXPR_COALESCE, + RASQAL_EXPR_IF, + RASQAL_EXPR_URI, + RASQAL_EXPR_IRI, + RASQAL_EXPR_STRLANG, + RASQAL_EXPR_STRDT, + RASQAL_EXPR_BNODE, + RASQAL_EXPR_GROUP_CONCAT, + RASQAL_EXPR_SAMPLE, + RASQAL_EXPR_IN, + RASQAL_EXPR_NOT_IN, + RASQAL_EXPR_ISNUMERIC, + RASQAL_EXPR_YEAR, + RASQAL_EXPR_MONTH, + RASQAL_EXPR_DAY, + RASQAL_EXPR_HOURS, + RASQAL_EXPR_MINUTES, + RASQAL_EXPR_SECONDS, + RASQAL_EXPR_TIMEZONE, + RASQAL_EXPR_CURRENT_DATETIME, + RASQAL_EXPR_NOW, + RASQAL_EXPR_FROM_UNIXTIME, + RASQAL_EXPR_TO_UNIXTIME, + RASQAL_EXPR_CONCAT, + RASQAL_EXPR_STRLEN, + RASQAL_EXPR_SUBSTR, + RASQAL_EXPR_UCASE, + RASQAL_EXPR_LCASE, + RASQAL_EXPR_STRSTARTS, + RASQAL_EXPR_STRENDS, + RASQAL_EXPR_CONTAINS, + RASQAL_EXPR_ENCODE_FOR_URI, + RASQAL_EXPR_TZ, + RASQAL_EXPR_RAND, + RASQAL_EXPR_ABS, + RASQAL_EXPR_ROUND, + RASQAL_EXPR_CEIL, + RASQAL_EXPR_FLOOR, + RASQAL_EXPR_MD5, + RASQAL_EXPR_SHA1, + RASQAL_EXPR_SHA224, + RASQAL_EXPR_SHA256, + RASQAL_EXPR_SHA384, + RASQAL_EXPR_SHA512, + RASQAL_EXPR_STRBEFORE, + RASQAL_EXPR_STRAFTER, + RASQAL_EXPR_REPLACE, + RASQAL_EXPR_UUID, + RASQAL_EXPR_STRUUID, + /* internal */ + RASQAL_EXPR_LAST = RASQAL_EXPR_STRUUID +} rasqal_op; + + +/** + * rasqal_expression_flags: + * @RASQAL_EXPR_FLAG_DISTINCT: Distinct + * @RASQAL_EXPR_FLAG_AGGREGATE: Aggregate function expression + * + * Flags for expressions. + */ +typedef enum { + RASQAL_EXPR_FLAG_DISTINCT = 1, + RASQAL_EXPR_FLAG_AGGREGATE = 2 +} rasqal_expression_flags; + + +/** + * rasqal_expression: + * @world: rasqal_world object + * @usage: reference count - 1 for itself + * @op: expression operation + * @arg1: first argument + * @arg2: second argument + * @arg3: third argument (for #RASQAL_EXPR_REGEX ) + * @literal: literal argument + * @value: UTF-8 value + * @name: name for extension function qname(args...) and cast-to-uri + * @args: args for extension function qname(args...), cast-to-uri and COALESCE + * @params: args for extension function parameters (SPARQL 1.1) (Rasqal 0.9.20+) + * @flags: bitflags from #rasqal_expression_flags for expressions (Rasqal 0.9.20+) + * @arg4: fourth argument (for #RASQAL_EXPR_REPLACE ) + * + * Expression with arguments + * + */ +struct rasqal_expression_s { + rasqal_world* world; + + int usage; + + rasqal_op op; + + struct rasqal_expression_s* arg1; + struct rasqal_expression_s* arg2; + struct rasqal_expression_s* arg3; + rasqal_literal* literal; + unsigned char *value; + + raptor_uri* name; + raptor_sequence* args; + + raptor_sequence* params; + unsigned int flags; + struct rasqal_expression_s* arg4; +}; +typedef struct rasqal_expression_s rasqal_expression; + + +/** + * rasqal_triple: + * @subject: Triple subject. + * @predicate: Triple predicate. + * @object: Triple object. + * @origin: Triple origin. + * @flags: Or of enum #rasqal_triple_flags bits. + * + * A triple pattern or RDF triple. + * + * This is used as a triple pattern in queries and + * an RDF triple when generating RDF triples such as with SPARQL CONSTRUCT. + */ +typedef struct { + rasqal_literal* subject; + rasqal_literal* predicate; + rasqal_literal* object; + rasqal_literal* origin; + unsigned int flags; +} rasqal_triple; + + +/** + * rasqal_pattern_flags: + * @RASQAL_PATTERN_FLAGS_OPTIONAL: True when the graph pattern is an optional match. + * @RASQAL_PATTERN_FLAGS_LAST: Internal + * + * Flags for #rasqal_graph_pattern. + */ +typedef enum { + RASQAL_PATTERN_FLAGS_OPTIONAL = 1, + + RASQAL_PATTERN_FLAGS_LAST = RASQAL_PATTERN_FLAGS_OPTIONAL +} rasqal_pattern_flags; + + +/** + * rasqal_generate_bnodeid_handler: + * @world: world arg + * @user_data: user data given to + * @user_bnodeid: user blank node ID string passed in + * + * User handler used with rasqal_world_set_generate_bnodeid_handler() to set method for generating a blank node ID. + * + * Return value: blank node ID string or NULL on failure. + */ +typedef unsigned char* (*rasqal_generate_bnodeid_handler)(rasqal_world* world, void *user_data, unsigned char *user_bnodeid); + + +/** + * rasqal_query_verb: + * @RASQAL_QUERY_VERB_SELECT: SPARQL query select verb. + * @RASQAL_QUERY_VERB_CONSTRUCT: SPARQL query construct verb. + * @RASQAL_QUERY_VERB_DESCRIBE: SPARQL query describe verb. + * @RASQAL_QUERY_VERB_ASK: SPARQL query ask verb. + * @RASQAL_QUERY_VERB_DELETE: LAQRS query delete verb. + * @RASQAL_QUERY_VERB_INSERT: LAQRS query insert verb. + * @RASQAL_QUERY_VERB_UPDATE: SPARQL 1.1 (draft) update operation + * @RASQAL_QUERY_VERB_UNKNOWN: Internal + * @RASQAL_QUERY_VERB_LAST: Internal + * + * Query main operation verbs describing the major type of query + * being performed. + */ +typedef enum { + /* internal */ + RASQAL_QUERY_VERB_UNKNOWN = 0, + RASQAL_QUERY_VERB_SELECT = 1, + RASQAL_QUERY_VERB_CONSTRUCT = 2, + RASQAL_QUERY_VERB_DESCRIBE = 3, + RASQAL_QUERY_VERB_ASK = 4, + RASQAL_QUERY_VERB_DELETE = 5, + RASQAL_QUERY_VERB_INSERT = 6, + RASQAL_QUERY_VERB_UPDATE = 7, + + /* internal */ + RASQAL_QUERY_VERB_LAST = RASQAL_QUERY_VERB_UPDATE +} rasqal_query_verb; + + +/** + * rasqal_query_results_type: + * @RASQAL_QUERY_RESULTS_BINDINGS: variable binding + * @RASQAL_QUERY_RESULTS_BOOLEAN: a single boolean + * @RASQAL_QUERY_RESULTS_GRAPH: an RDF graph + * @RASQAL_QUERY_RESULTS_SYNTAX: a syntax + * @RASQAL_QUERY_RESULTS_UNKNOWN: unknown type + * @RASQAL_QUERY_RESULTS_LAST: internal + * + * Query result type. + */ + +typedef enum { + RASQAL_QUERY_RESULTS_BINDINGS, + RASQAL_QUERY_RESULTS_BOOLEAN, + RASQAL_QUERY_RESULTS_GRAPH, + RASQAL_QUERY_RESULTS_SYNTAX, + RASQAL_QUERY_RESULTS_UNKNOWN, + RASQAL_QUERY_RESULTS_LAST = RASQAL_QUERY_RESULTS_UNKNOWN +} rasqal_query_results_type; + + +/** + * rasqal_update_type: + * @RASQAL_UPDATE_TYPE_CLEAR: Clear graph. + * @RASQAL_UPDATE_TYPE_CREATE: Create graph. + * @RASQAL_UPDATE_TYPE_DROP: Drop graph. + * @RASQAL_UPDATE_TYPE_LOAD: Load graph. + * @RASQAL_UPDATE_TYPE_UPDATE: Insert or Delete graph or triples. + * @RASQAL_UPDATE_TYPE_ADD: Add graph to another graph. + * @RASQAL_UPDATE_TYPE_MOVE: Move graph to another grpah. + * @RASQAL_UPDATE_TYPE_COPY: Copy graph to another graph. + * @RASQAL_UPDATE_TYPE_UNKNOWN: Internal + * @RASQAL_UPDATE_TYPE_LAST: Internal + * + * Update type being performed. + * + */ +typedef enum { + /* internal */ + RASQAL_UPDATE_TYPE_UNKNOWN = 0, + RASQAL_UPDATE_TYPE_CLEAR = 1, + RASQAL_UPDATE_TYPE_CREATE = 2, + RASQAL_UPDATE_TYPE_DROP = 3, + RASQAL_UPDATE_TYPE_LOAD = 4, + RASQAL_UPDATE_TYPE_UPDATE = 5, + RASQAL_UPDATE_TYPE_ADD = 6, + RASQAL_UPDATE_TYPE_MOVE = 7, + RASQAL_UPDATE_TYPE_COPY = 8, + + /* internal */ + RASQAL_UPDATE_TYPE_LAST = RASQAL_UPDATE_TYPE_COPY +} rasqal_update_type; + + +/** + * rasqal_update_flags: + * @RASQAL_UPDATE_FLAGS_SILENT: the update operation should be silent + * @RASQAL_UPDATE_FLAGS_DATA: the update operation is triple data not templates + * + * Bitflags for graph update operations + */ +typedef enum { + RASQAL_UPDATE_FLAGS_SILENT = 1, + RASQAL_UPDATE_FLAGS_DATA = 2 +} rasqal_update_flags; + + +/** + * rasqal_update_graph_applies: + * @RASQAL_UPDATE_GRAPH_ONE: the update operation applies to 1 graph + * @RASQAL_UPDATE_GRAPH_DEFAULT: the update operation applies to the default graph + * @RASQAL_UPDATE_GRAPH_NAMED: the update operation applies to all named graphs + * @RASQAL_UPDATE_GRAPH_ALL: the update operation applies ALL graphs + * + * The graph(s) that the update operation applies to. + */ +typedef enum { + RASQAL_UPDATE_GRAPH_ONE = 0, + RASQAL_UPDATE_GRAPH_DEFAULT = 1, + RASQAL_UPDATE_GRAPH_NAMED = 2, + RASQAL_UPDATE_GRAPH_ALL = 3 +} rasqal_update_graph_applies; + + +/** + * rasqal_update_operation: + * @type: type of update + * @graph_uri: optional graph URI (clear, drop, load, with ... delete, insert); source graph (add, move, copy) + * @document_uri: optional document URI (load); destination graph (add, move, copy) + * @insert_templates: optional sequence of #rasqal_triple to insert. Data triples if @flags is #RASQAL_UPDATE_FLAGS_DATA set, templates otherwise. + * @delete_templates: optional sequence of #rasqal_triple templates to delete + * @where: optional where template (insert/delete) + * @flags: update flags - bit-or of flags defined in #rasqal_update_flags + * @applies: the graph(s) that the update operation applies to, or @graph_uri if #RASQAL_UPDATE_GRAPH_ONE + * + * Update operation - changing the dataset + * + * For LOAD and CLEAR if @applies is set (not 0) then the operation + * applies to just those graph(), otherwise it applies to the @graph_uri. + * + * For ADD, MOVE and COPY the source graph is stored in @graph_uri + * field and the destination graph in the @document_uri field. The + * field names have no meaning in this case since both values are + * always present, always graphs and a NULL value signifies the + * default graph. + * + */ +typedef struct { + rasqal_update_type type; + + raptor_uri* graph_uri; + + raptor_uri* document_uri; + + raptor_sequence* insert_templates; + + raptor_sequence* delete_templates; + + rasqal_graph_pattern* where; + + int flags; + + rasqal_update_graph_applies applies; +} rasqal_update_operation; + + +/** + * rasqal_graph_pattern_operator: + * @RASQAL_GRAPH_PATTERN_OPERATOR_BASIC: Just triple patterns and constraints. + * @RASQAL_GRAPH_PATTERN_OPERATOR_OPTIONAL: Set of graph patterns (ANDed) and constraints. + * @RASQAL_GRAPH_PATTERN_OPERATOR_UNION: Set of graph patterns (UNIONed) and constraints. + * @RASQAL_GRAPH_PATTERN_OPERATOR_GROUP: Set of graph patterns (ANDed) and constraints. + * @RASQAL_GRAPH_PATTERN_OPERATOR_GRAPH: A graph term + a graph pattern and constraints. + * @RASQAL_GRAPH_PATTERN_OPERATOR_FILTER: A filter graph pattern with an expression + * @RASQAL_GRAPH_PATTERN_OPERATOR_LET: LET ?var := Expression (LAQRS) + * @RASQAL_GRAPH_PATTERN_OPERATOR_SELECT: SELECT graph pattern + * @RASQAL_GRAPH_PATTERN_OPERATOR_SERVICE: SERVICE graph pattern + * @RASQAL_GRAPH_PATTERN_OPERATOR_MINUS: MINUS graph pattern + * @RASQAL_GRAPH_PATTERN_OPERATOR_VALUES: VALUES graph pattern + * @RASQAL_GRAPH_PATTERN_OPERATOR_UNKNOWN: Internal. + * @RASQAL_GRAPH_PATTERN_OPERATOR_LAST: Internal. + * + * Graph pattern operators + */ +typedef enum { + RASQAL_GRAPH_PATTERN_OPERATOR_UNKNOWN = 0, + RASQAL_GRAPH_PATTERN_OPERATOR_BASIC = 1, + RASQAL_GRAPH_PATTERN_OPERATOR_OPTIONAL = 2, + RASQAL_GRAPH_PATTERN_OPERATOR_UNION = 3, + RASQAL_GRAPH_PATTERN_OPERATOR_GROUP = 4, + RASQAL_GRAPH_PATTERN_OPERATOR_GRAPH = 5, + RASQAL_GRAPH_PATTERN_OPERATOR_FILTER = 6, + RASQAL_GRAPH_PATTERN_OPERATOR_LET = 7, + RASQAL_GRAPH_PATTERN_OPERATOR_SELECT = 8, + RASQAL_GRAPH_PATTERN_OPERATOR_SERVICE = 9, + RASQAL_GRAPH_PATTERN_OPERATOR_MINUS = 10, + RASQAL_GRAPH_PATTERN_OPERATOR_VALUES = 11, + + RASQAL_GRAPH_PATTERN_OPERATOR_LAST = RASQAL_GRAPH_PATTERN_OPERATOR_VALUES +} rasqal_graph_pattern_operator; + + +/** + * rasqal_graph_pattern_visit_fn: + * @query: #rasqal_query containing the graph pattern + * @gp: current graph_pattern + * @user_data: user data passed in + * + * User function to visit a graph_pattern and operate on it with + * rasqal_graph_pattern_visit() or rasqal_query_graph_pattern_visit() + * + * Return value: non-0 to truncate the visit + */ +typedef int (*rasqal_graph_pattern_visit_fn)(rasqal_query* query, rasqal_graph_pattern* gp, void *user_data); + + +/* RASQAL API */ + +/* Public functions */ + +RASQAL_API +rasqal_world *rasqal_new_world(void); +RASQAL_API +int rasqal_world_open(rasqal_world* world); +RASQAL_API +void rasqal_free_world(rasqal_world* world); + +RASQAL_API +void rasqal_world_set_raptor(rasqal_world* world, raptor_world* raptor_world_ptr); +RASQAL_API +raptor_world *rasqal_world_get_raptor(rasqal_world* world); + +RASQAL_API +void rasqal_world_set_log_handler(rasqal_world* world, void *user_data, raptor_log_handler handler); + +RASQAL_API +int rasqal_world_set_default_generate_bnodeid_parameters(rasqal_world* world, char *prefix, int base); +RASQAL_API +int rasqal_world_set_generate_bnodeid_handler(rasqal_world* world, void *user_data, rasqal_generate_bnodeid_handler handler); + +RASQAL_API +int rasqal_world_set_warning_level(rasqal_world* world, unsigned int warning_level); + +RASQAL_API +const raptor_syntax_description* rasqal_world_get_query_results_format_description(rasqal_world* world, unsigned int counter); + +RASQAL_API +const char* rasqal_world_guess_query_results_format_name(rasqal_world* world, raptor_uri *uri, const char *mime_type, const unsigned char *buffer, size_t len, const unsigned char *identifier); + +/* Features */ +RASQAL_API +int rasqal_features_enumerate(rasqal_world* world, const rasqal_feature feature, const char **name, raptor_uri **uri, const char **label); +RASQAL_API +unsigned int rasqal_get_feature_count(void); +RASQAL_API +rasqal_feature rasqal_feature_from_uri(rasqal_world* world, raptor_uri *uri); +RASQAL_API +int rasqal_feature_value_type(const rasqal_feature feature); + + +RASQAL_API +const raptor_syntax_description* rasqal_world_get_query_language_description(rasqal_world* world, unsigned int counter); + +RASQAL_API RASQAL_DEPRECATED +int rasqal_languages_enumerate(rasqal_world* world, unsigned int counter, const char **name, const char **label, const unsigned char **uri_string); + +RASQAL_API +int rasqal_language_name_check(rasqal_world* world, const char *name); + + +/* Query class */ + +/* Create */ +RASQAL_API +rasqal_query* rasqal_new_query(rasqal_world* world, const char *name, const unsigned char *uri); + +/* Destroy */ +RASQAL_API +void rasqal_free_query(rasqal_query* query); + +/* Methods */ +RASQAL_API +const char* rasqal_query_get_name(rasqal_query* query); +RASQAL_API +const char* rasqal_query_get_label(rasqal_query* query); + + +RASQAL_API +int rasqal_query_set_feature(rasqal_query* query, rasqal_feature feature, int value); +RASQAL_API +int rasqal_query_set_feature_string(rasqal_query *query, rasqal_feature feature, const unsigned char *value); +RASQAL_API +int rasqal_query_get_feature(rasqal_query *query, rasqal_feature feature); +RASQAL_API +const unsigned char* rasqal_query_get_feature_string(rasqal_query *query, rasqal_feature feature); + +RASQAL_API +rasqal_query_verb rasqal_query_get_verb(rasqal_query* query); +RASQAL_API +int rasqal_query_get_wildcard(rasqal_query* query); +RASQAL_API +void rasqal_query_set_wildcard(rasqal_query* query, int wildcard); +RASQAL_API +int rasqal_query_get_distinct(rasqal_query* query); +RASQAL_API +void rasqal_query_set_distinct(rasqal_query* query, int distinct_mode); +RASQAL_API +int rasqal_query_get_explain(rasqal_query* query); +RASQAL_API +void rasqal_query_set_explain(rasqal_query* query, int is_explain); +RASQAL_API +int rasqal_query_get_limit(rasqal_query* query); +RASQAL_API +void rasqal_query_set_limit(rasqal_query* query, int limit); +RASQAL_API +int rasqal_query_get_offset(rasqal_query* query); +RASQAL_API +void rasqal_query_set_offset(rasqal_query* query, int offset); + +RASQAL_API +int rasqal_query_add_data_graph(rasqal_query* query, rasqal_data_graph* data_graph); +RASQAL_API +int rasqal_query_add_data_graphs(rasqal_query* query, raptor_sequence* data_graphs); + +RASQAL_API +raptor_sequence* rasqal_query_get_data_graph_sequence(rasqal_query* query); +RASQAL_API +rasqal_data_graph* rasqal_query_get_data_graph(rasqal_query* query, int idx); +RASQAL_API +int rasqal_query_dataset_contains_named_graph(rasqal_query* query, raptor_uri *graph_uri); + +RASQAL_API +int rasqal_query_add_variable(rasqal_query* query, rasqal_variable* var); +RASQAL_API +raptor_sequence* rasqal_query_get_bound_variable_sequence(rasqal_query* query); +RASQAL_API +raptor_sequence* rasqal_query_get_describe_sequence(rasqal_query* query); +RASQAL_API +raptor_sequence* rasqal_query_get_anonymous_variable_sequence(rasqal_query* query); +RASQAL_API +raptor_sequence* rasqal_query_get_all_variable_sequence(rasqal_query* query); +RASQAL_API +rasqal_variable* rasqal_query_get_variable(rasqal_query* query, int idx); +RASQAL_API +int rasqal_query_has_variable2(rasqal_query* query, rasqal_variable_type type, const unsigned char *name); +RASQAL_API RASQAL_DEPRECATED +int rasqal_query_has_variable(rasqal_query* query, const unsigned char *name); +RASQAL_API +int rasqal_query_set_variable2(rasqal_query* query, rasqal_variable_type type, const unsigned char *name, rasqal_literal* value); +RASQAL_API RASQAL_DEPRECATED +int rasqal_query_set_variable(rasqal_query* query, const unsigned char *name, rasqal_literal* value); +RASQAL_API +raptor_sequence* rasqal_query_get_triple_sequence(rasqal_query* query); +RASQAL_API +rasqal_triple* rasqal_query_get_triple(rasqal_query* query, int idx); +RASQAL_API +int rasqal_query_add_prefix(rasqal_query* query, rasqal_prefix* prefix); +RASQAL_API +raptor_sequence* rasqal_query_get_prefix_sequence(rasqal_query* query); +RASQAL_API +rasqal_prefix* rasqal_query_get_prefix(rasqal_query* query, int idx); +RASQAL_API +raptor_sequence* rasqal_query_get_order_conditions_sequence(rasqal_query* query); +RASQAL_API +rasqal_expression* rasqal_query_get_order_condition(rasqal_query* query, int idx); +RASQAL_API +raptor_sequence* rasqal_query_get_group_conditions_sequence(rasqal_query* query); +RASQAL_API +rasqal_expression* rasqal_query_get_group_condition(rasqal_query* query, int idx); +RASQAL_API +raptor_sequence* rasqal_query_get_having_conditions_sequence(rasqal_query* query); +RASQAL_API +rasqal_expression* rasqal_query_get_having_condition(rasqal_query* query, int idx); +RASQAL_API +raptor_sequence* rasqal_query_get_construct_triples_sequence(rasqal_query* query); +RASQAL_API +rasqal_triple* rasqal_query_get_construct_triple(rasqal_query* query, int idx); +RASQAL_API RASQAL_DEPRECATED +void rasqal_query_graph_pattern_visit(rasqal_query* query, rasqal_graph_pattern_visit_fn visit_fn, void* data); +RASQAL_API +int rasqal_query_graph_pattern_visit2(rasqal_query* query, rasqal_graph_pattern_visit_fn visit_fn, void* data); +RASQAL_API +int rasqal_query_write(raptor_iostream* iostr, rasqal_query* query, raptor_uri* format_uri, raptor_uri* base_uri); + +/* update */ +RASQAL_API +raptor_sequence* rasqal_query_get_update_operations_sequence(rasqal_query* query); +RASQAL_API +rasqal_update_operation* rasqal_query_get_update_operation(rasqal_query* query, int idx); + +/* results */ +int rasqal_query_set_store_results(rasqal_query* query, int store_results); + +/* graph patterns */ +RASQAL_API +rasqal_graph_pattern* rasqal_query_get_query_graph_pattern(rasqal_query* query); +RASQAL_API +raptor_sequence* rasqal_query_get_graph_pattern_sequence(rasqal_query* query); +RASQAL_API +rasqal_graph_pattern* rasqal_query_get_graph_pattern(rasqal_query* query, int idx); +RASQAL_API +int rasqal_graph_pattern_add_sub_graph_pattern(rasqal_graph_pattern* graph_pattern, rasqal_graph_pattern* sub_graph_pattern); +RASQAL_API +rasqal_triple* rasqal_graph_pattern_get_triple(rasqal_graph_pattern* graph_pattern, int idx); +RASQAL_API +raptor_sequence* rasqal_graph_pattern_get_sub_graph_pattern_sequence(rasqal_graph_pattern* graph_pattern); +RASQAL_API +rasqal_graph_pattern* rasqal_graph_pattern_get_sub_graph_pattern(rasqal_graph_pattern* graph_pattern, int idx); +RASQAL_API +rasqal_graph_pattern_operator rasqal_graph_pattern_get_operator(rasqal_graph_pattern* graph_pattern); +RASQAL_API +const char* rasqal_graph_pattern_operator_as_string(rasqal_graph_pattern_operator op); +RASQAL_API +int rasqal_graph_pattern_print(rasqal_graph_pattern* gp, FILE* fh); +RASQAL_API +int rasqal_graph_pattern_set_filter_expression(rasqal_graph_pattern* gp, rasqal_expression* expr); +RASQAL_API +rasqal_expression* rasqal_graph_pattern_get_filter_expression(rasqal_graph_pattern* gp); +RASQAL_API +int rasqal_graph_pattern_visit(rasqal_query* query, rasqal_graph_pattern *gp, rasqal_graph_pattern_visit_fn fn, void* user_data); +RASQAL_API +int rasqal_graph_pattern_get_index(rasqal_graph_pattern* gp); +RASQAL_API +int rasqal_graph_pattern_variable_bound_in(rasqal_graph_pattern *gp, rasqal_variable *v); +RASQAL_API +rasqal_literal* rasqal_graph_pattern_get_origin(rasqal_graph_pattern* graph_pattern); +RASQAL_API +rasqal_variable* rasqal_graph_pattern_get_variable(rasqal_graph_pattern* graph_pattern); +RASQAL_API +rasqal_literal* rasqal_graph_pattern_get_service(rasqal_graph_pattern* graph_pattern); +RASQAL_API +raptor_sequence* rasqal_graph_pattern_get_flattened_triples(rasqal_query* query, rasqal_graph_pattern* graph_pattern); +RASQAL_API +raptor_sequence* rasqal_graph_pattern_get_triples(rasqal_query* query, rasqal_graph_pattern* graph_pattern); + + +/* Utility methods */ +RASQAL_API +const char* rasqal_query_verb_as_string(rasqal_query_verb verb); +RASQAL_API +int rasqal_query_print(rasqal_query* query, FILE* fh); + +/* Query */ +RASQAL_API +int rasqal_query_prepare(rasqal_query* query, const unsigned char *query_string, raptor_uri *base_uri); +RASQAL_API +rasqal_query_results* rasqal_query_execute(rasqal_query* query); + +RASQAL_API +void* rasqal_query_get_user_data(rasqal_query* query); +RASQAL_API +void rasqal_query_set_user_data(rasqal_query* query, void *user_data); + +RASQAL_API +raptor_sequence* rasqal_query_get_bindings_variables_sequence(rasqal_query* query); +RASQAL_API +rasqal_variable* rasqal_query_get_bindings_variable(rasqal_query* query, int idx); +RASQAL_API +raptor_sequence* rasqal_query_get_bindings_rows_sequence(rasqal_query* query); +RASQAL_API +rasqal_row* rasqal_query_get_bindings_row(rasqal_query* query, int idx); +RASQAL_API +rasqal_query_results_type rasqal_query_get_result_type(rasqal_query* query); + +/* query results */ +RASQAL_API +rasqal_query_results* rasqal_new_query_results2(rasqal_world* world, rasqal_query* query, rasqal_query_results_type type); +RASQAL_API RASQAL_DEPRECATED +rasqal_query_results* rasqal_new_query_results(rasqal_world* world, rasqal_query* query, rasqal_query_results_type type, rasqal_variables_table* vars_table); +RASQAL_API +rasqal_query_results* rasqal_new_query_results_from_string(rasqal_world* world, rasqal_query_results_type type, raptor_uri* base_uri, const char* string, size_t string_len); +RASQAL_API +void rasqal_free_query_results(rasqal_query_results *query_results); + +RASQAL_API +rasqal_query* rasqal_query_results_get_query(rasqal_query_results* query_results); + +/* Bindings result format */ +RASQAL_API +rasqal_query_results_type rasqal_query_results_get_type(rasqal_query_results* query_results); +RASQAL_API +const char* rasqal_query_results_type_label(rasqal_query_results_type type); +RASQAL_API +int rasqal_query_results_is_bindings(rasqal_query_results *query_results); +RASQAL_API +int rasqal_query_results_get_count(rasqal_query_results *query_results); +RASQAL_API +int rasqal_query_results_next(rasqal_query_results *query_results); +RASQAL_API +int rasqal_query_results_finished(rasqal_query_results *query_results); +RASQAL_API +int rasqal_query_results_get_bindings(rasqal_query_results *query_results, const unsigned char ***names, rasqal_literal ***values); +RASQAL_API +rasqal_literal* rasqal_query_results_get_binding_value(rasqal_query_results *query_results, int offset); +RASQAL_API +const unsigned char* rasqal_query_results_get_binding_name(rasqal_query_results *query_results, int offset); +RASQAL_API +rasqal_literal* rasqal_query_results_get_binding_value_by_name(rasqal_query_results *query_results, const unsigned char *name); +RASQAL_API +int rasqal_query_results_get_bindings_count(rasqal_query_results *query_results); +RASQAL_API +int rasqal_query_results_add_row(rasqal_query_results* query_results, rasqal_row* row); +RASQAL_API +rasqal_row* rasqal_query_results_get_row_by_offset(rasqal_query_results* query_results, int result_offset); + +/* Boolean result format */ +RASQAL_API +int rasqal_query_results_is_boolean(rasqal_query_results *query_results); +RASQAL_API +int rasqal_query_results_get_boolean(rasqal_query_results *query_results); + +/* Graph result format */ +RASQAL_API +int rasqal_query_results_is_graph(rasqal_query_results *query_results); +RASQAL_API +raptor_statement* rasqal_query_results_get_triple(rasqal_query_results *query_results); +RASQAL_API +int rasqal_query_results_next_triple(rasqal_query_results *query_results); + +/* Syntax result format */ +RASQAL_API +int rasqal_query_results_is_syntax(rasqal_query_results* query_results); + +RASQAL_API +int rasqal_query_results_write(raptor_iostream *iostr, rasqal_query_results *results, const char* name, const char* mime_type, raptor_uri *format_uri, raptor_uri *base_uri); +RASQAL_API +int rasqal_query_results_read(raptor_iostream *iostr, rasqal_query_results *results, const char* name, const char* mime_type, raptor_uri *format_uri, raptor_uri *base_uri); + +/* One more time */ +RASQAL_API +int rasqal_query_results_rewind(rasqal_query_results* query_results); + + +/** + * rasqal_query_results_format_flags: + * @RASQAL_QUERY_RESULTS_FORMAT_FLAG_READER: format can be read. + * @RASQAL_QUERY_RESULTS_FORMAT_FLAG_WRITER: format can be written. + * + * Bitflags for rasqal_query_results_formats_check() to find formats with features. + */ +typedef enum { + RASQAL_QUERY_RESULTS_FORMAT_FLAG_READER = 1, + RASQAL_QUERY_RESULTS_FORMAT_FLAG_WRITER = 2 +} rasqal_query_results_format_flags; + + +RASQAL_API +int rasqal_query_results_formats_check2(rasqal_world* world, const char *name, raptor_uri* uri, const char *mime_type, int flags); +RASQAL_API RASQAL_DEPRECATED +int rasqal_query_results_formats_check(rasqal_world* world, const char *name, raptor_uri* uri, const char *mime_type, int flags); +RASQAL_API +rasqal_query_results_formatter* rasqal_new_query_results_formatter(rasqal_world* world, const char *name, const char *mime_type, raptor_uri* format_uri); +RASQAL_API +rasqal_query_results_formatter* rasqal_new_query_results_formatter_for_content(rasqal_world* world, raptor_uri *uri, const char *mime_type, const unsigned char *buffer, size_t len, const unsigned char *identifier); +RASQAL_API +void rasqal_free_query_results_formatter(rasqal_query_results_formatter* formatter); +RASQAL_API +int rasqal_query_results_formatter_write(raptor_iostream *iostr, rasqal_query_results_formatter* formatter, rasqal_query_results* results, raptor_uri *base_uri); +RASQAL_API +int rasqal_query_results_formatter_read(rasqal_world* world, raptor_iostream *iostr, rasqal_query_results_formatter* formatter, rasqal_query_results* results, raptor_uri *base_uri); + +RASQAL_API +int rasqal_query_iostream_write_escaped_counted_string(rasqal_query* query, raptor_iostream* iostr, const unsigned char* string, size_t len); +RASQAL_API +unsigned char* rasqal_query_escape_counted_string(rasqal_query* query, const unsigned char *string, size_t len, size_t* output_len_p); + + +/* Data graph class */ +RASQAL_API +rasqal_data_graph* rasqal_new_data_graph_from_uri(rasqal_world* world, raptor_uri* uri, raptor_uri* name_uri, unsigned int flags, const char* format_type, const char* format_name, raptor_uri* format_uri); +RASQAL_API +rasqal_data_graph* rasqal_new_data_graph_from_iostream(rasqal_world* world, raptor_iostream* iostr, raptor_uri* base_uri, raptor_uri* name_uri, unsigned int flags, const char* format_type, const char* format_name, raptor_uri* format_uri); +RASQAL_API +rasqal_data_graph* rasqal_new_data_graph_from_data_graph(rasqal_data_graph* dg); +RASQAL_API +void rasqal_free_data_graph(rasqal_data_graph* dg); +RASQAL_API +int rasqal_data_graph_print(rasqal_data_graph* dg, FILE* fh); + + +/** + * rasqal_compare_flags: + * @RASQAL_COMPARE_NOCASE: String comparisons are case independent. + * @RASQAL_COMPARE_XQUERY: XQuery comparsion rules apply. + * @RASQAL_COMPARE_RDF: RDF Term comparsion rules apply. + * @RASQAL_COMPARE_URI: Allow comparison of URIs and allow strings to have a boolean value (unused; was for RDQL) + * @RASQAL_COMPARE_SAMETERM: SPARQL sameTerm() builtin rules apply. + * + * Flags for rasqal_expression_evaluate(), rasqal_literal_compare() or + * rasqal_literal_as_string_flags() + */ +typedef enum { + RASQAL_COMPARE_NOCASE = 1, + RASQAL_COMPARE_XQUERY = 2, + RASQAL_COMPARE_RDF = 4, + RASQAL_COMPARE_URI = 8, + RASQAL_COMPARE_SAMETERM = 16 +} rasqal_compare_flags; + + +/** + * rasqal_random: + * + * Internal + */ +typedef struct rasqal_random_s rasqal_random; + + +/** + * rasqal_evaluation_context: + * @world: rasqal world + * @base_uri: base URI of expression context (or NULL) + * @locator: locator or NULL + * @flags: expression comparison flags + * @seed: random seeed + * @random: random number generator object + * + * A context for evaluating an expression such as with + * rasqal_expression_evaluate2() + */ +typedef struct { + rasqal_world *world; + raptor_uri* base_uri; + raptor_locator *locator; + int flags; + unsigned int seed; + rasqal_random* random; +} rasqal_evaluation_context; + + +/* Expression class */ +RASQAL_API +rasqal_expression* rasqal_new_0op_expression(rasqal_world* world, rasqal_op op); +RASQAL_API +rasqal_expression* rasqal_new_1op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg); +RASQAL_API +rasqal_expression* rasqal_new_2op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, rasqal_expression* arg2); +RASQAL_API +rasqal_expression* rasqal_new_3op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, rasqal_expression* arg2, rasqal_expression* arg3); +RASQAL_API +rasqal_expression* rasqal_new_4op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, rasqal_expression* arg2, rasqal_expression* arg3, rasqal_expression* arg4); +RASQAL_API +rasqal_expression* rasqal_new_string_op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, rasqal_literal* literal); +RASQAL_API +rasqal_expression* rasqal_new_literal_expression(rasqal_world* world, rasqal_literal* literal); +RASQAL_API +rasqal_expression* rasqal_new_function_expression(rasqal_world* world, raptor_uri* name, raptor_sequence* args, raptor_sequence* params, unsigned int flags); +RASQAL_API +rasqal_expression* rasqal_new_aggregate_function_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, raptor_sequence* params, unsigned int flags); +RASQAL_API +rasqal_expression* rasqal_new_cast_expression(rasqal_world* world, raptor_uri* name, rasqal_expression *value); +RASQAL_API +rasqal_expression* rasqal_new_expr_seq_expression(rasqal_world* world, rasqal_op op, raptor_sequence* args); +RASQAL_API +rasqal_expression* rasqal_new_set_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, raptor_sequence* args); +RASQAL_API +rasqal_expression* rasqal_new_group_concat_expression(rasqal_world* world, unsigned int flags, raptor_sequence* args, rasqal_literal* separator); +RASQAL_API +rasqal_expression* rasqal_new_expression_from_expression(rasqal_expression* e); + +RASQAL_API +void rasqal_free_expression(rasqal_expression* e); +RASQAL_API +void rasqal_expression_print_op(rasqal_expression* e, FILE* fh); +RASQAL_API +int rasqal_expression_print(rasqal_expression* e, FILE* fh); +RASQAL_API RASQAL_DEPRECATED +rasqal_literal* rasqal_expression_evaluate(rasqal_world *world, raptor_locator *locator, rasqal_expression* e, int flags); +RASQAL_API +rasqal_literal* rasqal_expression_evaluate2(rasqal_expression *e, rasqal_evaluation_context* eval_context, int *error_p); +RASQAL_API +const char* rasqal_expression_op_label(rasqal_op op); +RASQAL_API +int rasqal_expression_compare(rasqal_expression* e1, rasqal_expression* e2, int flags, int* error_p); + +/** + * rasqal_expression_visit_fn: + * @user_data: user data passed in with rasqal_expression_visit() + * @e: current expression + * + * User function to visit an expression and operate on it with + * rasqal_expression_visit() + * + * Return value: non-0 to truncate the visit + */ +typedef int (*rasqal_expression_visit_fn)(void *user_data, rasqal_expression *e); +RASQAL_API +int rasqal_expression_visit(rasqal_expression* e, rasqal_expression_visit_fn fn, void *user_data); + +RASQAL_API +rasqal_evaluation_context* rasqal_new_evaluation_context(rasqal_world* world, raptor_locator* locator, int flags); +RASQAL_API +void rasqal_free_evaluation_context(rasqal_evaluation_context* eval_context); +RASQAL_API +int rasqal_evaluation_context_set_base_uri(rasqal_evaluation_context* eval_context, raptor_uri *base_uri); +RASQAL_API +int rasqal_evaluation_context_set_rand_seed(rasqal_evaluation_context* eval_context, unsigned int seed); + + +/* Literal class */ +RASQAL_API +rasqal_literal* rasqal_new_integer_literal(rasqal_world* world, rasqal_literal_type type, int integer); +RASQAL_API +rasqal_literal* rasqal_new_numeric_literal_from_long(rasqal_world* world, rasqal_literal_type type, long value); +RASQAL_API +rasqal_literal* rasqal_new_typed_literal(rasqal_world* world, rasqal_literal_type type, const unsigned char* string); +RASQAL_API +rasqal_literal* rasqal_new_double_literal(rasqal_world* world, double d); +RASQAL_API +rasqal_literal* rasqal_new_floating_literal(rasqal_world *world, rasqal_literal_type type, double d); +RASQAL_API RASQAL_DEPRECATED +rasqal_literal* rasqal_new_float_literal(rasqal_world* world, float f); +RASQAL_API +rasqal_literal* rasqal_new_uri_literal(rasqal_world* world, raptor_uri* uri); +RASQAL_API +rasqal_literal* rasqal_new_pattern_literal(rasqal_world* world, const unsigned char *pattern, const char *flags); +RASQAL_API +rasqal_literal* rasqal_new_string_literal(rasqal_world* world, const unsigned char *string, const char *language, raptor_uri *datatype, const unsigned char *datatype_qname); +RASQAL_API +rasqal_literal* rasqal_new_simple_literal(rasqal_world* world, rasqal_literal_type type, const unsigned char *string); +RASQAL_API +rasqal_literal* rasqal_new_boolean_literal(rasqal_world* world, int value); +RASQAL_API +rasqal_literal* rasqal_new_variable_literal(rasqal_world* world, rasqal_variable *variable); +RASQAL_API +rasqal_literal* rasqal_new_decimal_literal(rasqal_world* world, const unsigned char *string); +RASQAL_API +rasqal_literal* rasqal_new_decimal_literal_from_decimal(rasqal_world* world, const unsigned char *string, rasqal_xsd_decimal* decimal); +RASQAL_API +rasqal_literal* rasqal_new_datetime_literal_from_datetime(rasqal_world* world, rasqal_xsd_datetime* dt); + + +RASQAL_API +rasqal_literal* rasqal_new_literal_from_literal(rasqal_literal* l); +RASQAL_API +void rasqal_free_literal(rasqal_literal* l); +RASQAL_API +int rasqal_literal_print(rasqal_literal* l, FILE* fh); +RASQAL_API +const char* rasqal_literal_type_label(rasqal_literal_type type); +RASQAL_API +void rasqal_literal_print_type(rasqal_literal* l, FILE* fh); +RASQAL_API +rasqal_variable* rasqal_literal_as_variable(rasqal_literal* l); +RASQAL_API +const unsigned char* rasqal_literal_as_counted_string(rasqal_literal* l, size_t *len_p, int flags, int *error_p); +RASQAL_API +const unsigned char* rasqal_literal_as_string(rasqal_literal* l); +RASQAL_API +const unsigned char* rasqal_literal_as_string_flags(rasqal_literal* l, int flags, int *error_p); +RASQAL_API +rasqal_literal* rasqal_literal_as_node(rasqal_literal* l); +RASQAL_API +raptor_uri* rasqal_literal_datatype(rasqal_literal* l); +RASQAL_API +rasqal_literal* rasqal_literal_value(rasqal_literal* l); + +RASQAL_API +int rasqal_literal_compare(rasqal_literal* l1, rasqal_literal* l2, int flags, int *error_p); +RASQAL_API +int rasqal_literal_equals(rasqal_literal* l1, rasqal_literal* l2); +RASQAL_API +int rasqal_literal_same_term(rasqal_literal* l1, rasqal_literal* l2); +RASQAL_API +rasqal_literal_type rasqal_literal_get_rdf_term_type(rasqal_literal* l); +RASQAL_API +rasqal_literal_type rasqal_literal_get_type(rasqal_literal* l); +RASQAL_API +char* rasqal_literal_get_language(rasqal_literal* l); +RASQAL_API +int rasqal_literal_is_rdf_literal(rasqal_literal* l); + + +RASQAL_API +rasqal_prefix* rasqal_new_prefix(rasqal_world* world, const unsigned char* prefix, raptor_uri* uri); +RASQAL_API +void rasqal_free_prefix(rasqal_prefix* p); +RASQAL_API +int rasqal_prefix_print(rasqal_prefix* p, FILE* fh); + + +/* Row class */ +RASQAL_API +rasqal_row* rasqal_new_row_for_size(rasqal_world* world, int size); +RASQAL_API +void rasqal_free_row(rasqal_row* row); +RASQAL_API +int rasqal_row_set_value_at(rasqal_row* row, int offset, rasqal_literal* value); + + +/* Triple class */ +RASQAL_API +rasqal_triple* rasqal_new_triple(rasqal_literal* subject, rasqal_literal* predicate, rasqal_literal* object); +RASQAL_API +rasqal_triple* rasqal_new_triple_from_triple(rasqal_triple* t); +RASQAL_API +void rasqal_free_triple(rasqal_triple* t); +RASQAL_API +int rasqal_triple_print(rasqal_triple* t, FILE* fh); +RASQAL_API +void rasqal_triple_set_origin(rasqal_triple* t, rasqal_literal *l); +RASQAL_API +rasqal_literal* rasqal_triple_get_origin(rasqal_triple* t); + +/* Variable class */ +RASQAL_API +rasqal_variable* rasqal_new_variable_from_variable(rasqal_variable* v); +RASQAL_API +void rasqal_free_variable(rasqal_variable* v); +RASQAL_API +int rasqal_variable_print(rasqal_variable* v, FILE* fh); +RASQAL_API +void rasqal_variable_set_value(rasqal_variable* v, rasqal_literal* l); + + +/* Variables Table */ +RASQAL_API +rasqal_variables_table* rasqal_new_variables_table(rasqal_world* world); +RASQAL_API +void rasqal_free_variables_table(rasqal_variables_table* vt); +RASQAL_API RASQAL_DEPRECATED +rasqal_variable* rasqal_variables_table_add(rasqal_variables_table* vt, rasqal_variable_type type, const unsigned char *name, rasqal_literal *value); +RASQAL_API +rasqal_variable* rasqal_variables_table_add2(rasqal_variables_table* vt, rasqal_variable_type type, const unsigned char *name, size_t name_len, rasqal_literal *value); +RASQAL_API +int rasqal_variables_table_add_variable(rasqal_variables_table* vt, rasqal_variable* variable); +RASQAL_API +rasqal_variable* rasqal_variables_table_get_by_name(rasqal_variables_table* vt, rasqal_variable_type type, const unsigned char *name); +RASQAL_API +int rasqal_variables_table_contains(rasqal_variables_table* vt, rasqal_variable_type type, const unsigned char *name); + +/* memory functions */ +RASQAL_API +void rasqal_free_memory(void *ptr); +RASQAL_API +void* rasqal_alloc_memory(size_t size); +RASQAL_API +void* rasqal_calloc_memory(size_t nmemb, size_t size); + + +/* decimal functions */ +RASQAL_API +rasqal_xsd_decimal* rasqal_new_xsd_decimal(rasqal_world* world); +RASQAL_API +void rasqal_free_xsd_decimal(rasqal_xsd_decimal* dec); +RASQAL_API +int rasqal_xsd_decimal_set_string(rasqal_xsd_decimal* dec, const char* string); +RASQAL_API +double rasqal_xsd_decimal_get_double(rasqal_xsd_decimal* dec); +RASQAL_API +long rasqal_xsd_decimal_get_long(rasqal_xsd_decimal* dec, int* error_p); +RASQAL_API +char* rasqal_xsd_decimal_as_string(rasqal_xsd_decimal* dec); +RASQAL_API +char* rasqal_xsd_decimal_as_counted_string(rasqal_xsd_decimal* dec, size_t* len_p); +RASQAL_API +int rasqal_xsd_decimal_set_long(rasqal_xsd_decimal* dec, long l); +RASQAL_API +int rasqal_xsd_decimal_set_double(rasqal_xsd_decimal* dec, double d); +RASQAL_API +int rasqal_xsd_decimal_print(rasqal_xsd_decimal* dec, FILE* stream); +RASQAL_API +int rasqal_xsd_decimal_add(rasqal_xsd_decimal* result, rasqal_xsd_decimal* a, rasqal_xsd_decimal* b); +RASQAL_API +int rasqal_xsd_decimal_subtract(rasqal_xsd_decimal* result, rasqal_xsd_decimal* a, rasqal_xsd_decimal* b); +RASQAL_API +int rasqal_xsd_decimal_multiply(rasqal_xsd_decimal* result, rasqal_xsd_decimal* a, rasqal_xsd_decimal* b); +RASQAL_API +int rasqal_xsd_decimal_divide(rasqal_xsd_decimal* result, rasqal_xsd_decimal* a, rasqal_xsd_decimal* b); +RASQAL_API +int rasqal_xsd_decimal_negate(rasqal_xsd_decimal* result, rasqal_xsd_decimal* a); +RASQAL_API +int rasqal_xsd_decimal_compare(rasqal_xsd_decimal* a, rasqal_xsd_decimal* b); +RASQAL_API +int rasqal_xsd_decimal_equals(rasqal_xsd_decimal* a, rasqal_xsd_decimal* b); +RASQAL_API +int rasqal_xsd_decimal_is_zero(rasqal_xsd_decimal* d); +RASQAL_API +int rasqal_xsd_decimal_abs(rasqal_xsd_decimal* result, rasqal_xsd_decimal* a); +RASQAL_API +int rasqal_xsd_decimal_round(rasqal_xsd_decimal* result, rasqal_xsd_decimal* a); +RASQAL_API +int rasqal_xsd_decimal_ceil(rasqal_xsd_decimal* result, rasqal_xsd_decimal* a); +RASQAL_API +int rasqal_xsd_decimal_floor(rasqal_xsd_decimal* result, rasqal_xsd_decimal* a); + + +/* date functions */ +RASQAL_API +rasqal_xsd_date* rasqal_new_xsd_date(rasqal_world* world, const char *date_string); +RASQAL_API +void rasqal_free_xsd_date(rasqal_xsd_date* d); +RASQAL_API +char* rasqal_xsd_date_to_counted_string(const rasqal_xsd_date *date, size_t *len_p); +RASQAL_API +char* rasqal_xsd_date_to_string(const rasqal_xsd_date *d); +RASQAL_API +int rasqal_xsd_date_equals(const rasqal_xsd_date *d1, const rasqal_xsd_date *d2, int *incomparible_p); +RASQAL_API +int rasqal_xsd_date_compare(const rasqal_xsd_date *d1, const rasqal_xsd_date *d2, int *incomparible_p); + +/* datetime functions */ +RASQAL_API +rasqal_xsd_datetime* rasqal_new_xsd_datetime(rasqal_world* world, const char *datetime_string); +RASQAL_API +rasqal_xsd_datetime* rasqal_new_xsd_datetime_from_unixtime(rasqal_world* world, time_t secs); +RASQAL_API +rasqal_xsd_datetime* rasqal_new_xsd_datetime_from_timeval(rasqal_world* world, struct timeval *tv); +RASQAL_API +rasqal_xsd_datetime* rasqal_new_xsd_datetime_from_xsd_date(rasqal_world* world, rasqal_xsd_date *date); +RASQAL_API +void rasqal_free_xsd_datetime(rasqal_xsd_datetime* dt); +RASQAL_API +char* rasqal_xsd_datetime_to_counted_string(const rasqal_xsd_datetime *dt, size_t *len_p); +RASQAL_API +char* rasqal_xsd_datetime_to_string(const rasqal_xsd_datetime *dt); +RASQAL_API +int rasqal_xsd_datetime_equals2(const rasqal_xsd_datetime *dt1, const rasqal_xsd_datetime *dt2, int *incomparible_p); +RASQAL_API RASQAL_DEPRECATED +int rasqal_xsd_datetime_equals(const rasqal_xsd_datetime *dt1, const rasqal_xsd_datetime *dt2); +RASQAL_API +int rasqal_xsd_datetime_compare2(const rasqal_xsd_datetime *dt1, const rasqal_xsd_datetime *dt2, int *incomparible_p); +RASQAL_API RASQAL_DEPRECATED +int rasqal_xsd_datetime_compare(const rasqal_xsd_datetime *dt1, const rasqal_xsd_datetime *dt2); +RASQAL_API +rasqal_xsd_decimal* rasqal_xsd_datetime_get_seconds_as_decimal(rasqal_world* world, rasqal_xsd_datetime* dt); +RASQAL_API +int rasqal_xsd_datetime_set_from_timeval(rasqal_xsd_datetime *dt, struct timeval *tv); +RASQAL_API +int rasqal_xsd_datetime_set_from_unixtime(rasqal_xsd_datetime* dt, time_t clock); +RASQAL_API +time_t rasqal_xsd_datetime_get_as_unixtime(rasqal_xsd_datetime* dt); +RASQAL_API +struct timeval* rasqal_xsd_datetime_get_as_timeval(rasqal_xsd_datetime *dt); +RASQAL_API +char* rasqal_xsd_datetime_get_timezone_as_counted_string(rasqal_xsd_datetime *dt, size_t *len_p); +RASQAL_API +char* rasqal_xsd_datetime_get_tz_as_counted_string(rasqal_xsd_datetime* dt, size_t *len_p); + + +/* regex utilities */ +RASQAL_API +char* rasqal_regex_replace(rasqal_world* world, raptor_locator* locator, const char* pattern, const char* regex_flags, const char* subject, size_t subject_len, const char* replace, size_t replace_len, size_t* result_len_p); + + +/** + * rasqal_service: + * + * Rasqal SPARQL Protocol Service + */ +typedef struct rasqal_service_s rasqal_service; + +RASQAL_API +rasqal_service* rasqal_new_service(rasqal_world* world, raptor_uri* service_uri, const unsigned char* query_string, raptor_sequence* data_graphs); +RASQAL_API +void rasqal_free_service(rasqal_service* svc); +RASQAL_API +rasqal_query_results* rasqal_service_execute(rasqal_service* svc); +RASQAL_API +int rasqal_service_set_www(rasqal_service* svc, raptor_www* www); +RASQAL_API +int rasqal_service_set_format(rasqal_service* svc, const char *format); + + + +/** + * rasqal_triple_parts: + * @RASQAL_TRIPLE_NONE: no parts + * @RASQAL_TRIPLE_SUBJECT: Subject present in a triple. + * @RASQAL_TRIPLE_PREDICATE: Predicate present in a triple. + * @RASQAL_TRIPLE_OBJECT: Object present in a triple. + * @RASQAL_TRIPLE_ORIGIN: Origin/graph present in a triple. + * @RASQAL_TRIPLE_GRAPH: Alias for RASQAL_TRIPLE_ORIGIN + * @RASQAL_TRIPLE_SPO: Subject, Predicate and Object present in a triple. + * @RASQAL_TRIPLE_SPOG: Subject, Predicate, Object, Graph present in a triple. + * + * Flags for parts of a triple. + */ +typedef enum { + RASQAL_TRIPLE_NONE = 0, + RASQAL_TRIPLE_SUBJECT = 1, + RASQAL_TRIPLE_PREDICATE= 2, + RASQAL_TRIPLE_OBJECT = 4, + RASQAL_TRIPLE_ORIGIN = 8, + RASQAL_TRIPLE_GRAPH = RASQAL_TRIPLE_ORIGIN, + RASQAL_TRIPLE_SPO = RASQAL_TRIPLE_SUBJECT | RASQAL_TRIPLE_PREDICATE | RASQAL_TRIPLE_OBJECT, + RASQAL_TRIPLE_SPOG = RASQAL_TRIPLE_SPO | RASQAL_TRIPLE_GRAPH +} rasqal_triple_parts; + + + +/** + * rasqal_triples_match: + * @world: rasqal_world object + * @user_data: User data pointer for factory methods. + * @bind_match: The [4]array (s,p,o,origin) bindings against the current triple match only touching triple parts given. Returns parts that were bound or 0 on failure. + * @next_match: Move to next match. + * @is_end: Check for end of triple match - return non-0 if is end. + * @finish: Finish triples match and destroy any allocated memory. + * @is_exact: non-0 if triple to match is all literal constants + * @finished: >0 if the match has finished + * + * Triples match structure as initialised by #rasqal_triples_source + * method init_triples_match. + */ +struct rasqal_triples_match_s { + rasqal_world *world; + + void *user_data; + + rasqal_triple_parts (*bind_match)(struct rasqal_triples_match_s* rtm, void *user_data, rasqal_variable *bindings[4], rasqal_triple_parts parts); + + void (*next_match)(struct rasqal_triples_match_s* rtm, void *user_data); + + int (*is_end)(struct rasqal_triples_match_s* rtm, void *user_data); + + void (*finish)(struct rasqal_triples_match_s* rtm, void *user_data); + + int is_exact; + + int finished; +}; +typedef struct rasqal_triples_match_s rasqal_triples_match; + + +/** + * rasqal_triple_meta: + * @bindings: Variable bindings for this triple+origin to set. + * @triples_match: The matcher that is setting these bindings. + * @context: Context data used by the matcher. + * @parts: Bitmask of #rasqal_triple_parts flags describing the parts of the triple pattern that will bind to variables. There may also be variables mentioned that are bound in other triple patterns even if @parts is 0. + * @is_exact: unused + * @executed: unused + * + * Metadata for triple pattern matching for one triple pattern. + */ +typedef struct { + /* triple (subject, predicate, object) and origin */ + rasqal_variable* bindings[4]; + + rasqal_triples_match *triples_match; + + void *context; + + rasqal_triple_parts parts; + + int is_exact; + + int executed; +} rasqal_triple_meta; + + +/** + * RASQAL_TRIPLES_SOURCE_MIN_VERSION: + * + * Lowest accepted @rasqal_triples_source API version + */ +#define RASQAL_TRIPLES_SOURCE_MIN_VERSION 1 + +/** + * RASQAL_TRIPLES_SOURCE_MAX_VERSION: + * + * Highest accepted @rasqal_triples_source API version + */ +#define RASQAL_TRIPLES_SOURCE_MAX_VERSION 2 + + +/** + * rasqal_triples_source_feature: + * @RASQAL_TRIPLES_SOURCE_FEATURE_NONE: No feature + * @RASQAL_TRIPLES_SOURCE_FEATURE_IOSTREAM_DATA_GRAPH: Support raptor_iostream data graphs + * + * Optional features that may be supported by a triple source factory + */ +typedef enum { + RASQAL_TRIPLES_SOURCE_FEATURE_NONE, + RASQAL_TRIPLES_SOURCE_FEATURE_IOSTREAM_DATA_GRAPH +} rasqal_triples_source_feature; + + +/** + * rasqal_triples_source: + * @version: API version - only V1 is defined for now + * @query: Source for this query. + * @user_data: Context user data passed into the factory methods. + * @init_triples_match: Factory method to initialize a new #rasqal_triples_match. + * @triple_present: Factory method to return presence or absence of a complete triple. + * @free_triples_source: Factory method to deallocate resources. + * @support_feature: Factory method to test support for a feature, returning non-0 if supported + * + * Triples source as initialised by a #rasqal_triples_source_factory. + */ +struct rasqal_triples_source_s { + int version; + + rasqal_query* query; + + void *user_data; + + /* API v1 */ + int (*init_triples_match)(rasqal_triples_match* rtm, struct rasqal_triples_source_s* rts, void *user_data, rasqal_triple_meta *m, rasqal_triple *t); + + int (*triple_present)(struct rasqal_triples_source_s* rts, void *user_data, rasqal_triple *t); + + void (*free_triples_source)(void *user_data); + + /* API v2 onwards */ + int (*support_feature)(void *user_data, rasqal_triples_source_feature feature); +}; +typedef struct rasqal_triples_source_s rasqal_triples_source; + + +/** + * RASQAL_TRIPLES_SOURCE_FACTORY_MIN_VERSION: + * + * Lowest accepted @rasqal_triples_source_factory API version + */ +#define RASQAL_TRIPLES_SOURCE_FACTORY_MIN_VERSION 1 + +/** + * RASQAL_TRIPLES_SOURCE_FACTORY_MAX_VERSION: + * + * Highest accepted @rasqal_triples_source_factory API version + */ +#define RASQAL_TRIPLES_SOURCE_FACTORY_MAX_VERSION 3 + + +/** + * rasqal_triples_error_handler: + * @query: query object + * @locator: error locator (or NULL) + * @message: error message + * + * Triples source factory error handler callback. + */ +typedef void (*rasqal_triples_error_handler)(rasqal_query* query, raptor_locator* locator, const char* message); + + +/** + * rasqal_triples_error_handler2: + * @world: world object + * @locator: error locator (or NULL) + * @message: error message + * + * Triples source factory error handler callback. + */ +typedef void (*rasqal_triples_error_handler2)(rasqal_world* world, raptor_locator* locator, const char* message); + + +/** + * rasqal_triples_source_factory: + * @version: API factory version from 1 to 3 + * @user_data: User data for triples_source_factory. + * @user_data_size: Size of @user_data for new_triples_source. + * @new_triples_source: Create a new triples source - returns non-zero on failure < 0 is a 'no rdf data error', > 0 is an unspecified error. Error messages are generated by rasqal internally. (V1) + * @init_triples_source: Initialise a new triples source V2 for a particular source URI/base URI and syntax. Returns non-zero on failure with errors reported via the handler callback by the implementation. (V2) + * @init_triples_source2: Initialise a new triples source V3 for a particular source URI/base URI and syntax and given data graphs. Returns non-zero on failure with errors reported via the handler callback by the implementation. If bit 0 of flags is 1, enforce RAPTOR_FEATURE_NO_NET (V3) + * + * A factory that initialises #rasqal_triples_source structures to + * returning matches to a triple pattern across the dataset formed + * from the data graphs recorded in the @query object. + */ +typedef struct { + int version; + + void *user_data; + size_t user_data_size; + + /* API v1 */ + int (*new_triples_source)(rasqal_query* query, void *factory_user_data, void *user_data, rasqal_triples_source* rts); + /* API v2 onwards */ + int (*init_triples_source)(rasqal_query* query, void *factory_user_data, void *user_data, rasqal_triples_source* rts, rasqal_triples_error_handler handler); + /* API v3 onwards */ + int (*init_triples_source2)(rasqal_world* world, raptor_sequence* data_graphs, void *factory_user_data, void *user_data, rasqal_triples_source *rts, rasqal_triples_error_handler2 handler, unsigned int flags); +} rasqal_triples_source_factory; + + +/** + * rasqal_triples_source_factory_register_fn: + * @factory: factory to register + * + * Register a factory for generating triples sources #rasqal_triples_source + * + * Return value: non-0 on failure + */ +typedef int (*rasqal_triples_source_factory_register_fn)(rasqal_triples_source_factory *factory); + + +/* set the triples_source_factory */ +RASQAL_API +int rasqal_set_triples_source_factory(rasqal_world* world, rasqal_triples_source_factory_register_fn register_fn, void* user_data); + + + +/* The info below is solely for gtk-doc - ignore it */ + +/** + * raptor_world: + * + * Internal + */ + +/** + * RASQAL_QUERY_RESULTS_FORMATTER_DECLARED: + * + * Internal + */ + +/** + * RASQAL_WORLD_DECLARED: + * + * Internal + */ + + +/** + * RASQAL_LITERAL_UDT_DEFINED + * + * Internal + */ + +/** + * rasqal_expression_s: + * @world: Internal + * @usage: Internal + * @op: Internal + * @arg1: Internal + * @arg2: Internal + * @arg3: Internal + * @literal: Internal + * @value: Internal + * @name: Internal + * @args: Internal + * @params: Internal + * @flags: Internal + * @arg4: Internal + * + * Internal - see #rasqal_expression. + * + */ + +/** + * bind_match: + * @rtm: triples match context + * @user_data: user data + * @bindings: variable binding for parts of triple (s, p, o, g) + * @parts: parts of triple to match + * + * Internal - see #rasqal_triples_match + * + * Return value: match parts +*/ + +/** + * next_match: + * @rtm: triples match context + * @user_data: user data + * + * Internal - see #rasqal_triples_match + */ + +/** + * is_end: + * @rtm: triples match context + * @user_data: user data + * + * Internal - see #rasqal_triples_match + * + * Return value: non-0 if end of match + */ + +/** + * finish: + * @rtm: triples match context + * @user_data: user data + * + * Internal - see #rasqal_triples_match + */ + +/** + * init_triples_match: + * @rtm: triples match context + * @rts: triples match source + * @user_data: user data + * @m: triple meta + * @t: triple + * + * Internal - see #rasqal_triples_source + * + * Return value: non-0 on failure + */ + +/** + * triple_present: + * @rts: triples match source + * @user_data: user data + * @t: triple to test for presence + * + * Internal - see #rasqal_triples_source + * + * Return value: non-0 on failure + */ + +/** + * free_triples_source: + * @user_data: user data + * + * Internal - see #rasqal_triples_source + */ + +/** + * support_feature: + * @user_data: user data + * @feature: feature to test + * + * Internal - see #rasqal_triples_source + * + * Return value: non-0 if supported + */ + +/** + * rasqal_variables_table: + * + * Internal - for now + */ + + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/external/redland/rasqal/rpath.patch b/external/redland/rasqal/rpath.patch new file mode 100644 index 000000000..c0eed7725 --- /dev/null +++ b/external/redland/rasqal/rpath.patch @@ -0,0 +1,21 @@ +--- configure ++++ configure +@@ -9843,6 +9843,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd* | netbsdelf*-gnu) +--- utils/Makefile.in ++++ utils/Makefile.in +@@ -373,7 +373,7 @@ + $(man_MANS) \ + roqet.html + +-all: all-am ++all: + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj diff --git a/external/redland/redland/clang-cl.patch b/external/redland/redland/clang-cl.patch new file mode 100644 index 000000000..b5a7271fb --- /dev/null +++ b/external/redland/redland/clang-cl.patch @@ -0,0 +1,20 @@ +--- src/librdf.h ++++ src/librdf.h +@@ -74,7 +74,7 @@ + /* Use gcc 3.1+ feature to allow marking of deprecated API calls. + * This gives a warning during compiling. + */ +-#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 ++#if (defined __GNUC__ && (( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3)) || defined __clang__ + #define REDLAND_DEPRECATED __attribute__((deprecated)) + #define REDLAND_NORETURN __attribute__((__noreturn__)) + #else +@@ -83,7 +83,7 @@ + #endif + + +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) ++#if (defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))) || defined __clang__ + #define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \ + __attribute__((__format__(__printf__, string_index, first_to_check_index))) + #else diff --git a/external/redland/redland/librdf.h b/external/redland/redland/librdf.h new file mode 100644 index 000000000..44674c583 --- /dev/null +++ b/external/redland/redland/librdf.h @@ -0,0 +1,434 @@ +/* -*- Mode: c; c-basic-offset: 2 -*- + * + * redland.h - Redland RDF Application Framework public API + * + * Copyright (C) 2000-2011, David Beckett http://www.dajobe.org/ + * Copyright (C) 2000-2005, University of Bristol, UK http://www.bristol.ac.uk/ + * + * This package is Free Software and part of Redland http://librdf.org/ + * + * It is licensed under the following three licenses as alternatives: + * 1. GNU Lesser General Public License (LGPL) V2.1 or any newer version + * 2. GNU General Public License (GPL) V2 or any newer version + * 3. Apache License, V2.0 or any newer version + * + * You may not use this file except in compliance with at least one of + * the above three licenses. + * + * See LICENSE.html or LICENSE.txt at the top of this package for the + * complete terms and further detail along with the license texts for + * the licenses in COPYING.LIB, COPYING and LICENSE-2.0.txt respectively. + * + * + */ + + +#ifndef LIBRDF_H +#define LIBRDF_H + +#ifndef LIBRDF_OBJC_FRAMEWORK +/* raptor */ +#include <raptor2.h> +/* rasqal: uses raptor */ +#include <rasqal.h> +/* librdf: uses rasqal and raptor */ +#else +#include <Redland/raptor2.h> +#include <Redland/rasqal.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdio.h> + +#ifndef REDLAND_API +# ifdef _WIN32 +# ifdef __GNUC__ +# undef _declspec +# define _declspec(x) __declspec(x) +# endif +# ifdef REDLAND_STATIC +# define REDLAND_API +# else +# ifdef LIBRDF_INTERNAL +# define REDLAND_API _declspec(dllexport) +# else +# define REDLAND_API _declspec(dllimport) +# endif +# endif +# else +# define REDLAND_API +# endif +#endif + +#ifndef REDLAND_CALLBACK_STDCALL +# if defined(_WIN32) && defined(USE_STDCALL_CALLBACKS) +# define REDLAND_CALLBACK_STDCALL _stdcall +# else +# define REDLAND_CALLBACK_STDCALL +# endif +#endif + +/* Use gcc 3.1+ feature to allow marking of deprecated API calls. + * This gives a warning during compiling. + */ +#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 +#define REDLAND_DEPRECATED __attribute__((deprecated)) +#define REDLAND_NORETURN __attribute__((__noreturn__)) +#else +#define REDLAND_DEPRECATED +#define REDLAND_NORETURN +#endif + + +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \ + __attribute__((__format__(__printf__, string_index, first_to_check_index))) +#else +#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) +#endif + + +/* Public defines */ + +/** + * LIBRDF_VERSION: + * + * Redland librdf library version number + * + * Format: major * 10000 + minor * 100 + release + */ +#define LIBRDF_VERSION 10017 + +/** + * LIBRDF_VERSION_STRING: + * + * Redland librdf library version string + */ +#define LIBRDF_VERSION_STRING "1.0.17" + +/** + * LIBRDF_VERSION_MAJOR: + * + * Redland librdf library major version + */ +#define LIBRDF_VERSION_MAJOR 1 + +/** + * LIBRDF_VERSION_MINOR: + * + * Redland librdf library minor version + */ +#define LIBRDF_VERSION_MINOR 0 + +/** + * LIBRDF_VERSION_RELEASE: + * + * Redland librdf library release + */ +#define LIBRDF_VERSION_RELEASE 17 + + + +/* Public typedefs (references to private structures) */ + +/** + * librdf_world: + * + * Redland world class. + */ +typedef struct librdf_world_s librdf_world; + +/** + * librdf_hash: + * + * Redland hash class. + */ +typedef struct librdf_hash_s librdf_hash; + +/** + * librdf_hash_cursor: + * + * Redland hash cursor class. + */ +typedef struct librdf_hash_cursor_s librdf_hash_cursor; + +/** + * librdf_digest: + * + * Redland content digest class. + */ +typedef struct librdf_digest_s librdf_digest; + +/** + * librdf_digest_factory: + * + * Redland digest factory class. + */ +typedef struct librdf_digest_factory_s librdf_digest_factory; + +/** + * librdf_uri: + * + * Redland URI class. + */ +typedef struct raptor_uri_s librdf_uri; + +/** + * librdf_list: + * + * Redland list class. + */ +typedef struct librdf_list_s librdf_list; + +/** + * librdf_iterator: + * + * Redland iterator class. + */ +typedef struct librdf_iterator_s librdf_iterator; + +/** + * librdf_node: + * + * Redland node class. + */ +typedef raptor_term librdf_node; + +/** + * librdf_statement: + * + * Redland statement class. + */ +typedef raptor_statement librdf_statement; + +/** + * librdf_model: + * + * Redland model class. + */ +typedef struct librdf_model_s librdf_model; + +/** + * librdf_model_factory: + * + * Redland model factory class. + */ +typedef struct librdf_model_factory_s librdf_model_factory; + +/** + * librdf_storage: + * + * Redland storage class. + */ +typedef struct librdf_storage_s librdf_storage; + +/** + * librdf_storage_factory: + * + * Redland storage factory class. + */ +typedef struct librdf_storage_factory_s librdf_storage_factory; + +/** + * librdf_stream: + * + * Redland stream class. + */ +typedef struct librdf_stream_s librdf_stream; + +/** + * librdf_parser: + * + * Redland parser class. + */ +typedef struct librdf_parser_s librdf_parser; + +/** + * librdf_parser_factory: + * + * Redland parser factory class. + */ +typedef struct librdf_parser_factory_s librdf_parser_factory; + +/** + * librdf_query: + * + * Redland query class. + */ +typedef struct librdf_query_s librdf_query; + +/** + * librdf_query_factory: + * + * Redland query factory class. + */ +typedef struct librdf_query_factory_s librdf_query_factory; + +/** + * librdf_query_results: + * + * Redland query results class. + */ +typedef struct librdf_query_results_s librdf_query_results; + +/** + * librdf_query_results_formatter: + * + * Redland query results formatter class. + */ +typedef struct librdf_query_results_formatter_s librdf_query_results_formatter; + +/** + * librdf_serializer: + * + * Redland serializer class. + */ +typedef struct librdf_serializer_s librdf_serializer; + +/** + * librdf_serializer_factory: + * + * Redland serializer factory class. + */ +typedef struct librdf_serializer_factory_s librdf_serializer_factory; + + +/* Public statics */ + +/** + * librdf_short_copyright_string: + * + * Short copyright string (one line). + */ +REDLAND_API +extern const char * const librdf_short_copyright_string; + +/** + * librdf_copyright_string: + * + * Copyright string (multiple lines). + */ +REDLAND_API +extern const char * const librdf_copyright_string; + +/** + * librdf_version_string: + * + * Redland librdf version as a string. + */ +REDLAND_API +extern const char * const librdf_version_string; + +/** + * librdf_version_major: + * + * Redland librdf major version number. + */ +REDLAND_API +extern const unsigned int librdf_version_major; + +/** + * librdf_version_minor: + * + * Redland librdf minor version number. + */ +REDLAND_API +extern const unsigned int librdf_version_minor; + +/** + * librdf_version_release: + * + * Redland librdf release version number. + */ +REDLAND_API +extern const unsigned int librdf_version_release; + +/** + * librdf_version_decimal: + * + * Redland librdf version as a decimal number. + * + * Format: major * 10000 + minor * 100 + release + */ +REDLAND_API +extern const unsigned int librdf_version_decimal; + +/** + * librdf_license_string: + * + * Redland librdf license string. + */ +REDLAND_API +extern const char * const librdf_license_string; + +/** + * librdf_home_url_string: + * + * Redland librdf home page URL. + */ +REDLAND_API +extern const char * const librdf_home_url_string; + +/* Required for va_list in error handler function registrations + * which are in the public API + */ +#include <stdarg.h> + + +/* internal interfaces */ +#ifdef LIBRDF_INTERNAL +#include <rdf_internal.h> +#endif + +/* public interfaces */ + +/* FIXME: Should be replaced with automatically pulled + * definitions from the listed rdf_*.h header files. + */ + +#ifndef LIBRDF_OBJC_FRAMEWORK +#include <rdf_log.h> +#include <rdf_digest.h> +#include <rdf_hash.h> +#include <rdf_init.h> +#include <rdf_iterator.h> +#include <rdf_uri.h> +#include <rdf_node.h> +#include <rdf_concepts.h> +#include <rdf_statement.h> +#include <rdf_model.h> +#include <rdf_storage.h> +#include <rdf_parser.h> +#include <rdf_raptor.h> +#include <rdf_serializer.h> +#include <rdf_stream.h> +#include <rdf_query.h> +#include <rdf_utf8.h> +#else +#include <Redland/rdf_log.h> +#include <Redland/rdf_digest.h> +#include <Redland/rdf_hash.h> +#include <Redland/rdf_init.h> +#include <Redland/rdf_iterator.h> +#include <Redland/rdf_uri.h> +#include <Redland/rdf_node.h> +#include <Redland/rdf_concepts.h> +#include <Redland/rdf_statement.h> +#include <Redland/rdf_model.h> +#include <Redland/rdf_storage.h> +#include <Redland/rdf_parser.h> +#include <Redland/rdf_raptor.h> +#include <Redland/rdf_serializer.h> +#include <Redland/rdf_stream.h> +#include <Redland/rdf_query.h> +#include <Redland/rdf_utf8.h> +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/external/redland/redland/libtool.patch b/external/redland/redland/libtool.patch new file mode 100644 index 000000000..b0baae661 --- /dev/null +++ b/external/redland/redland/libtool.patch @@ -0,0 +1,27 @@ +--- build/ltmain.sh ++++ build/ltmain.sh +@@ -5301,6 +5301,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -5639,6 +5645,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/external/redland/redland/redland-android.patch.1 b/external/redland/redland/redland-android.patch.1 new file mode 100644 index 000000000..c28fa19ff --- /dev/null +++ b/external/redland/redland/redland-android.patch.1 @@ -0,0 +1,14 @@ +No sonames on Android + +--- a/configure 2013-03-29 19:46:34.922901756 +0100 ++++ b/configure 2013-03-29 19:46:56.051901574 +0100 +@@ -10267,7 +10267,7 @@ + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac +- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + diff --git a/external/redland/redland/redland-bundled-soname.patch.1 b/external/redland/redland/redland-bundled-soname.patch.1 new file mode 100644 index 000000000..867cd81e2 --- /dev/null +++ b/external/redland/redland/redland-bundled-soname.patch.1 @@ -0,0 +1,13 @@ +rhbz#809466 change soname of bundled redland libs + +--- a/src/Makefile.in 2013-03-30 17:43:48.127008037 +0100 ++++ b/src/Makefile.in 2013-03-30 17:44:19.294007769 +0100 +@@ -625,7 +625,7 @@ + rdf_parser_raptor.c + + EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl +-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \ ++librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo \ + @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ + + pkgdata_DATA = $(am__append_13) diff --git a/external/redland/redland/redland-format.patch.0 b/external/redland/redland/redland-format.patch.0 new file mode 100644 index 000000000..7bd62a8bb --- /dev/null +++ b/external/redland/redland/redland-format.patch.0 @@ -0,0 +1,10 @@ +--- src/rdf_log.c ++++ src/rdf_log.c +@@ -136,6 +136,7 @@ + char *buffer = LIBRDF_MALLOC(char*, slocator_len + 2); + *buffer=' '; + raptor_locator_format(buffer + 1, slocator_len, (raptor_locator*)locator); ++ buffer[slocator_len + 1] = '\0'; + fputs(buffer, stderr); + LIBRDF_FREE(char*, buffer); + } diff --git a/external/redland/redland/redland-freebsd.patch.1 b/external/redland/redland/redland-freebsd.patch.1 new file mode 100644 index 000000000..349f3a197 --- /dev/null +++ b/external/redland/redland/redland-freebsd.patch.1 @@ -0,0 +1,28 @@ +Usual patch to produce Linux-like .so files on FreeBSD + +--- a/build/ltmain.sh 2008-02-02 22:28:24.000000000 +0900 ++++ b/build/ltmain.sh 2008-07-08 11:58:42.000000000 +0900 +@@ -7341,9 +7341,9 @@ + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|qnx|sunos) +- current="$number_major" +- revision="$number_minor" +- age="0" ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor +@@ -7420,8 +7420,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current" ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" + ;; + + irix | nonstopux) diff --git a/external/redland/redland/redland-msvc.patch.1 b/external/redland/redland/redland-msvc.patch.1 new file mode 100644 index 000000000..e1f96b42a --- /dev/null +++ b/external/redland/redland/redland-msvc.patch.1 @@ -0,0 +1,123 @@ +--- redland.orig/src/win32_rdf_config.h 2015-09-02 23:12:12.894126138 +0200 ++++ redland/src/win32_rdf_config.h 2015-09-02 23:23:54.600173246 +0200 +@@ -43,7 +43,6 @@ + /* MS names for these functions */ + // next line breaks build on wntmsci12 + //#define vsnprintf _vsnprintf +-#define snprintf _snprintf + #define access _access + #define stricmp _stricmp + #define strnicmp _strnicmp +@@ -75,40 +78,40 @@ + */ + + /* BDB has close method with 2 args */ +-#define HAVE_BDB_CLOSE_2_ARGS 1 ++// #define HAVE_BDB_CLOSE_2_ARGS 1 + + /* BDB defines DBC */ +-#define HAVE_BDB_CURSOR 1 ++// #define HAVE_BDB_CURSOR 1 + + /* BDB cursor method has 4 arguments */ +-#define HAVE_BDB_CURSOR_4_ARGS 1 ++// #define HAVE_BDB_CURSOR_4_ARGS 1 + + /* BDB defines DB_TXN */ +-#define HAVE_BDB_DB_TXN 1 ++// #define HAVE_BDB_DB_TXN 1 + + /* BDB has fd method with 2 args */ +-#define HAVE_BDB_FD_2_ARGS 1 ++// #define HAVE_BDB_FD_2_ARGS 1 + + /* Have BDB hash support */ +-#define HAVE_BDB_HASH 1 ++// #define HAVE_BDB_HASH 1 + + /* BDB has open method with 6 args */ + /* #undef HAVE_BDB_OPEN_6_ARGS */ + + /* BDB has open method with 7 args */ +-#define HAVE_BDB_OPEN_7_ARGS 1 ++// #define HAVE_BDB_OPEN_7_ARGS 1 + + /* BDB has set_flags method */ +-#define HAVE_BDB_SET_FLAGS 1 ++// #define HAVE_BDB_SET_FLAGS 1 + + /* BDB has dbopen method */ + /* #undef HAVE_DBOPEN */ + + /* BDB has db_create method */ +-#define HAVE_DB_CREATE 1 ++// #define HAVE_DB_CREATE 1 + + /* Define to 1 if you have the <db.h> header file. */ +-#define HAVE_DB_H 1 ++// #define HAVE_DB_H 1 + + /* Define to 1 if you have the <dlfcn.h> header file. */ + /* undef HAVE_DLFCN_H */ +@@ -141,13 +144,13 @@ + /* #undef HAVE_LIBWWW */ + + /* Have local MD5 digest */ +-#define HAVE_LOCAL_MD5_DIGEST 1 ++// #define HAVE_LOCAL_MD5_DIGEST 1 + + /* Have local RIPEMD160 digest */ + /* #undef HAVE_LOCAL_RIPEMD160_DIGEST */ + + /* Have local SHA1 digest */ +-#define HAVE_LOCAL_SHA1_DIGEST 1 ++// #define HAVE_LOCAL_SHA1_DIGEST 1 + + /* Define to 1 if you have the <memory.h> header file. */ + #define HAVE_MEMORY_H 1 +@@ -159,7 +162,7 @@ + #define HAVE_MKTEMP 1 + + /* MySQL libraries are present */ +-#define HAVE_MYSQL 1 ++// #define HAVE_MYSQL 1 + + /* Define to 1 if you have the <openssl/crypto.h> header file. */ + /* #undef HAVE_OPENSSL_CRYPTO_H */ +@@ -261,7 +267,7 @@ + /*#undef STORAGE_POSTGRESQL*/ + + /* Building SQLite storage */ +-#define STORAGE_SQLITE 1 ++// #define STORAGE_SQLITE 1 + + /* Building 3store storage */ + /*#undef STORAGE_TSTORE*/ +@@ -288,11 +288,11 @@ + #include <io.h> + #include <memory.h> + +-/* get _isnan() since it is not in math.h */ +-#include <float.h> +-#ifndef isnan +-#define isnan(d) (_isnan(d)) +-#endif ++// /* get _isnan() since it is not in math.h */ ++// #include <float.h> ++// #ifndef isnan ++// #define isnan(d) (_isnan(d)) ++// #endif + + #ifdef __cplusplus + } +--- redland.orig/src/rdf_init.c 2015-09-02 23:12:12.894126138 +0200 ++++ redland/src/rdf_init.c 2015-09-02 23:23:54.600173246 +0200 +@@ -42,6 +42,8 @@ + #endif + #ifdef HAVE_UNISTD_H + #include <unistd.h> /* for getpid() */ ++#else ++#include <process.h> + #endif + + /* for gettimeofday */ diff --git a/external/redland/redland/redland-xcompile.patch.1 b/external/redland/redland/redland-xcompile.patch.1 new file mode 100644 index 000000000..2635359e7 --- /dev/null +++ b/external/redland/redland/redland-xcompile.patch.1 @@ -0,0 +1,15 @@ +No point in creating example or util executables when cross-compiling. +(Especially as doing it anyway wouldn't work without tweaks to have it find +libxml2 and libm, at least for Android.) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -395,7 +395,7 @@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc + + # Subdirectories to build/install/distribute etc. +-SUBDIRS = $(subdirs) src examples utils demos docs data scripts ++SUBDIRS = $(subdirs) src docs data scripts + EXTRA_DIST = \ + ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \ + ChangeLog.5 ChangeLog.6 ChangeLog.7 ChangeLog.8 ChangeLog.9 ChangeLog.10 \ diff --git a/external/redland/redland/rpath.patch b/external/redland/redland/rpath.patch new file mode 100644 index 000000000..ec8c765d5 --- /dev/null +++ b/external/redland/redland/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -10308,6 +10308,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd* | netbsdelf*-gnu) diff --git a/external/rhino/ExternalPackage_rhino.mk b/external/rhino/ExternalPackage_rhino.mk new file mode 100644 index 000000000..0ee1d60e3 --- /dev/null +++ b/external/rhino/ExternalPackage_rhino.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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,rhino,rhino)) + +$(eval $(call gb_ExternalPackage_use_external_project,rhino,rhino)) + +$(eval $(call gb_ExternalPackage_add_file,rhino,$(LIBO_SHARE_JAVA_FOLDER)/js.jar,build/rhino1_5R5/js.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/external/rhino/ExternalProject_rhino.mk b/external/rhino/ExternalProject_rhino.mk new file mode 100644 index 000000000..4d1b3e544 --- /dev/null +++ b/external/rhino/ExternalProject_rhino.mk @@ -0,0 +1,31 @@ +# -*- 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,rhino)) + +$(eval $(call gb_ExternalProject_register_targets,rhino,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,rhino,build) : + $(call gb_Trace_StartRange,rhino,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + $(if $(verbose),-v,-q) \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + -DTARFILE_LOCATION="$(if $(findstring -cygwin,$(BUILD_PLATFORM)),$(shell cygpath -m $(TARFILE_LOCATION)),$(TARFILE_LOCATION))" \ + -Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + $(if $(debug),-Dbuild.debug="on") \ + jar \ + ) + $(call gb_Trace_EndRange,rhino,EXTERNAL) + +# vim: set noet sw=4 ts=4: diff --git a/external/rhino/Makefile b/external/rhino/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/rhino/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/rhino/Module_rhino.mk b/external/rhino/Module_rhino.mk new file mode 100644 index 000000000..201d3ba9f --- /dev/null +++ b/external/rhino/Module_rhino.mk @@ -0,0 +1,22 @@ +# -*- 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,rhino)) + +ifneq ($(ENABLE_JAVA),) +ifneq ($(filter RHINO,$(BUILD_TYPE)),) +$(eval $(call gb_Module_add_targets,rhino,\ + ExternalPackage_rhino \ + ExternalProject_rhino \ + UnpackedTarball_rhino \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/rhino/OfficeScriptInfo.java b/external/rhino/OfficeScriptInfo.java new file mode 100644 index 000000000..eb1d78641 --- /dev/null +++ b/external/rhino/OfficeScriptInfo.java @@ -0,0 +1,118 @@ +/* + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +package org.mozilla.javascript.tools.debugger; +import java.net.URL; +import java.util.HashMap; +import org.mozilla.javascript.Scriptable; + +public class OfficeScriptInfo +{ + private HashMap<String, SFScriptInfo> loadedSFScripts = new HashMap<String, SFScriptInfo>(); + + public void addScript( URL url, Scriptable scope, Runnable closeCallback ) + { + addScript( url.toString(), url, scope, closeCallback ); + } + + public void addScript( String key, URL url, Scriptable scope, Runnable closeCallback ) + { + SFScriptInfo si = loadedSFScripts.get( key ); + if ( si == null ) + { + si = new SFScriptInfo(); + si.url = url; + si.scope = scope; + si.closeCallback = closeCallback; + loadedSFScripts.put( key, si ); + } + } + + public void deleteScript( String key ) + { + SFScriptInfo info = loadedSFScripts.remove( key ); + if ( info != null ) + { + if ( info.closeCallback != null ) + { + System.out.println("** In removeSFScriptInfo have callback for " + key ); + info.closeCallback.run(); // really need to do this in separate thread???? + } + } + } + + public Scriptable getScriptScope( String key ) + { + Scriptable result = null; + SFScriptInfo info = loadedSFScripts.get( key ); + if ( info != null ) + { + result = info.scope; + } + return result; + } + + public URL getScriptUrl( String key ) + { + URL result = null; + SFScriptInfo info = loadedSFScripts.get( key ); + if ( info != null ) + { + result = info.url; + } + return result; + } + public boolean hasScript( String key ) + { + boolean result = true; + SFScriptInfo info = loadedSFScripts.get( key ); + if ( info == null ) + { + result = false; + } + return result; + } + + public void setScriptRunning( String key, boolean running ) + { + SFScriptInfo info = loadedSFScripts.get( key ); + if ( info != null ) + { + info.isExecuting = running; + } + } + + public boolean isScriptRunning( String key ) + { + boolean result = false; + SFScriptInfo info = loadedSFScripts.get( key ); + if ( info != null ) + { + result = info.isExecuting; + } + return result; + } + + class SFScriptInfo + { + Scriptable scope; + boolean isExecuting; + URL url; + Runnable closeCallback; + } +} diff --git a/external/rhino/README b/external/rhino/README new file mode 100644 index 000000000..83e4135d0 --- /dev/null +++ b/external/rhino/README @@ -0,0 +1,14 @@ +JavaScript engine/interpreter written in Java, used to provide JavaScript extensions. + +The Scripting Framework makes use of the Rhino ([http://www.mozilla.org/rhino/]) +JavaScript interpreter, available under the Mozilla Public License +([http://www.mozilla.org/MPL/MPL-1.1.html]). + +In addition, to support the debugging of scripts contained in OpenOffice.org +documents, we have modified the Java source file Main.java. + +The Rhino source tarball is unpacked and patched with the modified code. The +Rhino Jar file (js.jar) is then built (download/swingExSrc.zip is unpacked and +built as part of this procesS) and delivered to the solver. The file +rhino1_5R5.patch contains the changes made in order to build Rhino. The patch +was generated using the command: diff -wurN diff --git a/external/rhino/UnpackedTarball_rhino.mk b/external/rhino/UnpackedTarball_rhino.mk new file mode 100644 index 000000000..0a1492b88 --- /dev/null +++ b/external/rhino/UnpackedTarball_rhino.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,rhino)) + +$(eval $(call gb_UnpackedTarball_set_tarball,rhino,$(RHINO_TARBALL),,rhino)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,rhino,2)) + +$(eval $(call gb_UnpackedTarball_add_patches,rhino,\ + external/rhino/rhino1_5R5.patch \ + external/rhino/rhino1_5R5-find_swing.patch \ + external/rhino/rhino1_5R5-updateToolTip.patch \ +)) + +$(eval $(call gb_UnpackedTarball_add_file,rhino,toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java,external/rhino/OfficeScriptInfo.java)) + +# vim: set noet sw=4 ts=4: diff --git a/external/rhino/rhino1_5R5-find_swing.patch b/external/rhino/rhino1_5R5-find_swing.patch new file mode 100644 index 000000000..905336eb1 --- /dev/null +++ b/external/rhino/rhino1_5R5-find_swing.patch @@ -0,0 +1,16 @@ +--- misc/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:46.605524507 +0100 ++++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:26.536908810 +0100 +@@ -38,11 +38,12 @@ + property="swing-ex-available"/> + </target> + ++ <property name="swing_zip" value="${TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/> + <target name="get-swing-ex" unless="swing-ex-available"> + <!-- Download source from Sun's site, unzip it, remove + the files we don't need, and change the package + --> +- <unzip src="../../../../../download/swingExSrc.zip" dest="${src.debugger}"/> ++ <unzip src="${swing_zip}" dest="${src.debugger}"/> + <delete file="${src.debugger}/FileSystemModel2.java" /> + <delete file="${src.debugger}/MergeSort.java" /> + <delete file="${src.debugger}/TreeTableExample2.java" /> diff --git a/external/rhino/rhino1_5R5-updateToolTip.patch b/external/rhino/rhino1_5R5-updateToolTip.patch new file mode 100644 index 000000000..be0700daf --- /dev/null +++ b/external/rhino/rhino1_5R5-updateToolTip.patch @@ -0,0 +1,23 @@ +--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java Wed Feb 23 10:25:09 2011 ++++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java Wed Feb 23 10:25:01 2011 +@@ -1045,9 +1045,18 @@ + } ); + } + ++ // Fix taken from <ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip> ++ // toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java: + private void updateToolTip() { +- // in case fileName is very long, try to set tool tip on frame +- Component c = getComponent(1); ++ // Try to set tool tip on frame. On macOS 10.5, ++ // the number of components is different, so try to be safe. ++ int n = getComponentCount() - 1; ++ if (n > 1) { ++ n = 1; ++ } else if (n < 0) { ++ return; ++ } ++ Component c = getComponent(n); + // this will work at least for Metal L&F + if (c != null && c instanceof JComponent) { + ((JComponent)c).setToolTipText(getUrl()); diff --git a/external/rhino/rhino1_5R5.patch b/external/rhino/rhino1_5R5.patch new file mode 100644 index 000000000..40fc6cc94 --- /dev/null +++ b/external/rhino/rhino1_5R5.patch @@ -0,0 +1,1067 @@ +--- misc/rhino1_5R5/src/org/mozilla/javascript/DefiningClassLoader.java Thu Mar 25 21:54:34 2004 ++++ misc/build/rhino1_5R5/src/org/mozilla/javascript/DefiningClassLoader.java Fri Mar 28 17:24:23 2008 +@@ -38,6 +38,7 @@ + package org.mozilla.javascript; + + import java.lang.reflect.Method; ++import java.lang.reflect.InvocationTargetException; + + /** + * Load generated classes. +@@ -48,11 +49,34 @@ + implements GeneratedClassLoader + { + public DefiningClassLoader() { +- this.parentLoader = getClass().getClassLoader(); ++ init(getClass().getClassLoader()); + } + + public DefiningClassLoader(ClassLoader parentLoader) { ++ ++ init(parentLoader); ++ } ++ ++ private void init(ClassLoader parentLoader) { ++ + this.parentLoader = parentLoader; ++ ++ this.contextLoader = null; ++ if (method_getContextClassLoader != null) { ++ try { ++ this.contextLoader = (ClassLoader) ++ method_getContextClassLoader.invoke( ++ Thread.currentThread(), ++ ScriptRuntime.emptyArgs); ++ } catch (IllegalAccessException ex) { ++ } catch (InvocationTargetException ex) { ++ } catch (SecurityException ex) { ++ } ++ if (this.contextLoader == this.parentLoader) { ++ this.contextLoader = null; ++ } ++ } ++ + } + + public Class defineClass(String name, byte[] data) { +@@ -68,10 +92,20 @@ + { + Class cl = findLoadedClass(name); + if (cl == null) { +- if (parentLoader != null) { +- cl = parentLoader.loadClass(name); ++ // First try parent class loader and if that does not work, try ++ // contextLoader, but that will be null if ++ // Thread.getContextClassLoader() == parentLoader ++ // or on JDK 1.1 due to lack Thread.getContextClassLoader(). ++ // To avoid catching and rethrowing ClassNotFoundException ++ // in this cases, use try/catch check only if contextLoader != null. ++ if (contextLoader == null) { ++ cl = loadFromParent(name); + } else { +- cl = findSystemClass(name); ++ try { ++ cl = loadFromParent(name); ++ } catch (ClassNotFoundException ex) { ++ cl = contextLoader.loadClass(name); ++ } + } + } + if (resolve) { +@@ -80,5 +114,37 @@ + return cl; + } + ++ private Class loadFromParent(String name) ++ throws ClassNotFoundException ++ { ++ if (parentLoader != null) { ++ return parentLoader.loadClass(name); ++ } else { ++ return findSystemClass(name); ++ } ++ ++ } ++ + private ClassLoader parentLoader; ++ ++ private ClassLoader contextLoader; ++ ++ // We'd like to use "Thread.getContextClassLoader", but ++ // that's only available on Java2. ++ private static Method method_getContextClassLoader; ++ ++ static { ++ try { ++ // Don't use "Thread.class": that performs the lookup ++ // in the class initializer, which doesn't allow us to ++ // catch possible security exceptions. ++ Class threadClass = Class.forName("java.lang.Thread"); ++ method_getContextClassLoader = ++ threadClass.getDeclaredMethod("getContextClassLoader", ++ new Class[0]); ++ } catch (ClassNotFoundException e) { ++ } catch (NoSuchMethodException e) { ++ } catch (SecurityException e) { ++ } ++ } + } +--- misc/rhino1_5R5/toolsrc/build.xml 2004-03-25 21:54:34.000000000 +0100 ++++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-01-17 20:46:44.000000000 +0100 +@@ -6,6 +6,28 @@ + --> + <project name="toolsrc" default="compile" basedir="."> + ++ <condition property="boot_refID" value="macPath" else="nonMacPath"> ++ <and> ++ <os family="mac"/> ++ <os family="unix"/> ++ <or> ++ <equals arg1="${ant.java.version}" arg2="1.5"/> ++ <equals arg1="${ant.java.version}" arg2="1.6"/> ++ </or> ++ </and> ++ </condition> ++ <path id="macPath" location="${java.home}/../Classes/classes.jar"/> ++ <!-- rhino.jar from OpenJDK breaks build --> ++ <path id="nonMacPath"> ++ <fileset dir="${java.home}/"> ++ <include name="jre/lib/*.jar"/> ++ <include name="lib/*.jar"/> ++ <exclude name="jre/lib/rhino.jar"/> ++ <exclude name="lib/rhino.jar"/> ++ </fileset> ++ </path> ++ <path id="my.bootstrap.classpath" refID="${boot_refID}"/> ++ + <target name="properties"> + <property name="nest" value=".."/> + <property name="build.dir" value="./build"/> +@@ -20,46 +42,10 @@ + <!-- Download source from Sun's site, unzip it, remove + the files we don't need, and change the package + --> +- <get src="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip" dest="${nest}/${build.dir}/swingExSrc.zip"/> +- <unzip src="${nest}/${build.dir}/swingExSrc.zip" dest="${src.debugger}"/> ++ <unzip src="../../../../../download/swingExSrc.zip" dest="${src.debugger}"/> + <delete file="${src.debugger}/FileSystemModel2.java" /> + <delete file="${src.debugger}/MergeSort.java" /> + <delete file="${src.debugger}/TreeTableExample2.java" /> +- <replace file="${src.debugger}/AbstractCellEditor.java"> +- <replacetoken>import java.awt.Component;</replacetoken> +- <replacevalue> +- package org.mozilla.javascript.tools.debugger; +- import java.awt.Component; +- </replacevalue> +- </replace> +- <replace file="${src.debugger}/AbstractTreeTableModel.java"> +- <replacetoken>import javax.swing.tree.*;</replacetoken> +- <replacevalue> +- package org.mozilla.javascript.tools.debugger; +- import javax.swing.tree.*; +- </replacevalue> +- </replace> +- <replace file="${src.debugger}/JTreeTable.java"> +- <replacetoken>import javax.swing.*;</replacetoken> +- <replacevalue> +- package org.mozilla.javascript.tools.debugger; +- import javax.swing.*; +- </replacevalue> +- </replace> +- <replace file="${src.debugger}/TreeTableModel.java"> +- <replacetoken>import javax.swing.tree.TreeModel;</replacetoken> +- <replacevalue> +- package org.mozilla.javascript.tools.debugger; +- import javax.swing.tree.TreeModel; +- </replacevalue> +- </replace> +- <replace file="${src.debugger}/TreeTableModelAdapter.java"> +- <replacetoken>import javax.swing.JTree;</replacetoken> +- <replacevalue> +- package org.mozilla.javascript.tools.debugger; +- import javax.swing.JTree; +- </replacevalue> +- </replace> + </target> + + <target name="compile" depends="properties,get-swing-ex"> +--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2004-03-25 21:54:34.000000000 +0100 ++++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java 2009-01-17 20:44:22.000000000 +0100 +@@ -470,15 +470,21 @@ + case KeyEvent.VK_BACK_SPACE: + case KeyEvent.VK_ENTER: + case KeyEvent.VK_DELETE: ++ if (w.isEditable() == false) { + e.consume(); ++ } + break; + } + } + public void keyTyped(KeyEvent e) { ++ if (w.isEditable() == false) { + e.consume(); ++ } + } + public void keyReleased(KeyEvent e) { ++ if (w.isEditable() == false) { + e.consume(); ++ } + } + } + +@@ -879,7 +885,7 @@ + } + }; + +-class FileWindow extends JInternalFrame implements ActionListener { ++class FileWindow extends JInternalFrame implements ActionListener, DocumentListener { + + Main db; + SourceInfo sourceInfo; +@@ -888,15 +894,16 @@ + JScrollPane p; + int currentPos; + JLabel statusBar; ++ boolean isModified = false; + + public void actionPerformed(ActionEvent e) { + String cmd = e.getActionCommand(); + if (cmd.equals("Cut")) { +- // textArea.cut(); ++ textArea.cut(); + } else if (cmd.equals("Copy")) { + textArea.copy(); + } else if (cmd.equals("Paste")) { +- // textArea.paste(); ++ textArea.paste(); + } + } + +@@ -910,17 +917,73 @@ + } + + void load() { +- Scriptable scope = db.getScope(); ++ //Scriptable scope = db.getScope(); ++ Scriptable scope = db.officeScripts.getScriptScope( getUrl() ); ++ if ( scope == null ) ++ { ++ scope = db.getScope(); ++ } + if (scope == null) { + MessageDialogWrapper.showMessageDialog(db, "Can't load scripts: no scope available", "Run", JOptionPane.ERROR_MESSAGE); + } else { + String url = getUrl(); + if (url != null) { +- new Thread(new LoadFile(db,scope,url)).start(); ++ new Thread(new LoadFile(db,scope, url, new StringReader(textArea.getText()))).start(); + } + } + } + ++ void save() { ++ if (getUrl() != null) { ++ OutputStream os = null; ++ try { ++ if ( getUrl().startsWith("vnd.sun.star") ) ++ { ++ URL scriptUrl = db.officeScripts.getScriptUrl( getUrl() ); ++ if ( scriptUrl == null ) ++ { ++ throw new IOException("Can't optain stream for " + getUrl() ); ++ } ++ os = scriptUrl.openConnection().getOutputStream(); ++ } ++ else ++ { ++ os = new FileOutputStream( getUrl() ); ++ } ++ String s = textArea.getText(); ++ os.write(s.getBytes(), 0, s.length()); ++ ++ this.isModified = false; ++ } ++ catch (IOException ioe) { ++ JOptionPane.showMessageDialog(this, ++ "Error saving file: " + ioe.getMessage(), ++ "Error", JOptionPane.ERROR_MESSAGE); ++ } ++ finally ++ { ++ if ( os != null ) ++ { ++ try ++ { ++ os.close(); ++ os = null; ++ } ++ catch( IOException ioe ) ++ { ++ System.err.println("Error closing stream: " + ioe.getMessage() ); ++ ioe.printStackTrace(); ++ } ++ } ++ } ++ } ++ } ++ ++ public boolean isEditable() { ++ return db.isSourceEditingEnabled(); ++ } ++ ++ + public int getPosition(int line) { + int result = -1; + try { +@@ -953,7 +1016,7 @@ + fileHeader.repaint(); + } + } +- ++ public Main getDB() { return db; } + FileWindow(Main db, SourceInfo sourceInfo) { + super(SourceInfo.getShortName(sourceInfo.getUrl()), + true, true, true, true); +@@ -972,6 +1035,14 @@ + pack(); + updateText(); + textArea.select(0); ++ addInternalFrameListener( new InternalFrameAdapter() { ++ public void internalFrameClosed(InternalFrameEvent e) { ++ // clean up scriptItems and sourceNames hashes ++ getDB().removeScript( getUrl() ); ++ // remove scripts for officeScripts ++ getDB().officeScripts.deleteScript( getUrl() ); ++ } ++ } ); + } + + private void updateToolTip() { +@@ -990,7 +1061,10 @@ + void updateText() { + String newText = sourceInfo.getSource(); + if (!textArea.getText().equals(newText)) { ++ textArea.getDocument().removeDocumentListener(this); + textArea.setText(newText); ++ this.isModified = false; ++ textArea.getDocument().addDocumentListener(this); + int pos = 0; + if (currentPos != -1) { + pos = currentPos; +@@ -1001,6 +1075,31 @@ + fileHeader.repaint(); + } + ++ /* Implementation of DocumentListener interface */ ++ public void insertUpdate(DocumentEvent e) { ++ doChanged(e); ++ } ++ ++ public void removeUpdate(DocumentEvent e) { ++ doChanged(e); ++ } ++ ++ public void changedUpdate(DocumentEvent e) { ++ doChanged(e); ++ } ++ ++ public void doChanged(DocumentEvent e) { ++ this.isModified = true; ++ } ++ ++ public boolean isModified() { ++ return this.isModified; ++ } ++ ++ public String getText() { ++ return textArea.getText(); ++ } ++ + void setPosition(int pos) { + textArea.select(pos); + currentPos = pos; +@@ -1618,7 +1717,7 @@ + if (line != -1) { + db.currentWindow = w; + } +- db.menubar.addFile(url); ++ // db.menubar.addFile(url); + w.setVisible(true); + if (activate) { + try { +@@ -1752,8 +1851,10 @@ + Menubar(Main db) { + super(); + this.db = db; +- String[] fileItems = {"Open...", "Run...", "", "Exit"}; +- String[] fileCmds = {"Open", "Load", "", "Exit"}; ++ // String[] fileItems = {"Open...", "Run...", "", "Exit"}; ++ // String[] fileCmds = {"Open", "Load", "", "Exit"}; ++ String[] fileItems = {"Run", "Save", "", "Exit"}; ++ String[] fileCmds = {"Run", "Save", "", "Exit"}; + char[] fileShortCuts = {'0', 'N', '\0', 'X'}; + int[] fileAccelerators = {KeyEvent.VK_O, + KeyEvent.VK_N, +@@ -1795,6 +1896,9 @@ + KeyStroke k = KeyStroke.getKeyStroke(fileAccelerators[i], Event.CTRL_MASK); + item.setAccelerator(k); + } ++ if (fileItems[i].equals("Save")) { ++ saveItem = item; ++ } + } + } + for (int i = 0; i < editItems.length; ++i) { +@@ -1849,9 +1953,9 @@ + item.addActionListener(this); + windowMenu.add(item = new JMenuItem("Tile", 'T')); + item.addActionListener(this); +- windowMenu.addSeparator(); +- windowMenu.add(item = new JMenuItem("Console", 'C')); +- item.addActionListener(this); ++// windowMenu.addSeparator(); ++// windowMenu.add(item = new JMenuItem("Console", 'C')); ++// item.addActionListener(this); + add(windowMenu); + + } +@@ -1925,11 +2029,16 @@ + item.addActionListener(this); + } + ++ public void setSaveEnabled(boolean state) { ++ saveItem.setEnabled(state); ++ } ++ + Main db; + JMenu windowMenu; + JCheckBoxMenuItem breakOnExceptions; + JCheckBoxMenuItem breakOnEnter; + JCheckBoxMenuItem breakOnReturn; ++ JMenuItem saveItem; + }; + + class EnterInterrupt implements Runnable { +@@ -1942,6 +2051,13 @@ + public void run() { + JMenu menu = db.getJMenuBar().getMenu(0); + //menu.getItem(0).setEnabled(false); // File->Load ++ ++ // disable Edit menu Cut, Copy, Paste items ++ menu = db.getJMenuBar().getMenu(1); ++ for (int i = 0; i < 3; i++) { ++ menu.getItem(i).setEnabled(false); ++ } ++ + menu = db.getJMenuBar().getMenu(2); + menu.getItem(0).setEnabled(false); // Debug->Break + int count = menu.getItemCount(); +@@ -1954,6 +2070,10 @@ + b = true; + } + db.toolBar.setEnabled(true); ++ ++ // set flag to disable source editing ++ db.setSourceEditingEnabled(false); ++ + // raise the debugger window + db.toFront(); + } +@@ -1967,6 +2087,13 @@ + public void run() { + JMenu menu = db.getJMenuBar().getMenu(0); + menu.getItem(0).setEnabled(true); // File->Load ++ ++ // enable Edit menu items ++ menu = db.getJMenuBar().getMenu(1); ++ for (int i = 0; i < 3; i++) { ++ menu.getItem(i).setEnabled(true); ++ } ++ + menu = db.getJMenuBar().getMenu(2); + menu.getItem(0).setEnabled(true); // Debug->Break + int count = menu.getItemCount() - 1; +@@ -1980,6 +2107,10 @@ + db.toolBar.getComponent(ci).setEnabled(b); + b = false; + } ++ ++ // set flag to enable source editing ++ db.setSourceEditingEnabled(true); ++ + //db.console.consoleTextArea.requestFocus(); + } + }; +@@ -1988,17 +2119,24 @@ + { + String fileName; + Main db; ++ Reader reader = null; + OpenFile(Main db, String fileName) + { + this.fileName = fileName; + this.db = db; + } ++ OpenFile(Main db, String fileName, Reader reader) { ++ this(db, fileName); ++ this.reader = reader; ++ } + public void run() { + Context cx = Context.enter(); + ContextData contextData = ContextData.get(cx); + contextData.breakNextLine = true; + try { +- cx.compileReader(new FileReader(fileName), fileName, 1, null); ++ cx.compileReader( ++ reader == null ? new FileReader(fileName) : reader, ++ fileName, 1, null); + } catch (Exception exc) { + String msg = exc.getMessage(); + if (exc instanceof EcmaError) { +@@ -2019,29 +2157,79 @@ + Scriptable scope; + String fileName; + Main db; ++ Reader reader = null; ++ Object result = null; ++ Exception exception = null; ++ int lineNum = -1; ++ boolean sfExecute = false; ++ + LoadFile(Main db, Scriptable scope, String fileName) { + this.scope = scope; + this.fileName = fileName; + this.db = db; + } ++ ++ LoadFile(Main db, Scriptable scope, String fileName, Reader reader) { ++ this(db, scope, fileName); ++ this.reader = reader; ++ } ++ LoadFile(Main db, Scriptable scope, String fileName, Reader reader, boolean sfExecute ) { ++ this(db, scope, fileName); ++ this.reader = reader; ++ this.sfExecute = sfExecute; ++ } ++ + public void run() { ++ if ( db.officeScripts.isScriptRunning( fileName ) ) ++ { ++ exception = new Exception("The script is already executing"); ++ if ( !sfExecute ) { ++ MessageDialogWrapper.showMessageDialog(db, ++ "Script already executing", ++ "Run", ++ JOptionPane.ERROR_MESSAGE); ++ } ++ return; ++ } ++ db.officeScripts.setScriptRunning( fileName, true ); + Context cx = Context.enter(); + ContextData contextData = ContextData.get(cx); ++ if ( sfExecute ) ++ { ++ contextData.breakNextLine = false; ++ } ++ else ++ { + contextData.breakNextLine = true; ++ } ++ /* ++ FileWindow w = (FileWindow)db.getSelectedFrame(); ++ if ( sfExecute ) ++ { ++ db.swingInvoke(new SetFilePosition(db, w, -1 ) ); ++ }*/ + try { +- cx.evaluateReader(scope, new FileReader(fileName), ++ result = cx.evaluateReader(scope, ++ reader == null ? new FileReader(fileName) : reader, + fileName, 1, null); + } catch (Exception exc) { ++ exception = exc; + String msg = exc.getMessage(); + if (exc instanceof EcmaError) { + EcmaError err = (EcmaError)exc; + msg = err.getSourceName() + ", line " + err.getLineNumber() + ": " + msg; +- } ++ ++ int lineNum = err.getLineNumber() ; ++ //db.swingInvoke(new SetFilePosition(db, w, lineNum ) ); ++ if ( !sfExecute ) { + MessageDialogWrapper.showMessageDialog(db, + msg, + "Run", + JOptionPane.ERROR_MESSAGE); ++ } ++ } + } finally { ++ db.officeScripts.setScriptRunning( fileName, false ); + cx.exit(); + } + } +@@ -2416,13 +2604,13 @@ + super.setVisible(b); + if (b) { + // this needs to be done after the window is visible +- console.consoleTextArea.requestFocus(); ++ // console.consoleTextArea.requestFocus(); + context.split.setDividerLocation(0.5); + try { +- console.setMaximum(true); +- console.setSelected(true); +- console.show(); +- console.consoleTextArea.requestFocus(); ++ // console.setMaximum(true); ++ // console.setSelected(true); ++ // console.show(); ++ // console.consoleTextArea.requestFocus(); + } catch (Exception exc) { + } + } +@@ -2449,35 +2637,6 @@ + + Hashtable functionNames = new Hashtable(); + +- ScriptItem getScriptItem(DebuggableScript fnOrScript) { +- ScriptItem item = (ScriptItem)scriptItems.get(fnOrScript); +- if (item == null) { +- String url = getNormilizedUrl(fnOrScript); +- SourceInfo si = (SourceInfo)sourceNames.get(url); +- if (si == null) { +- if (!fnOrScript.isGeneratedScript()) { +- // Not eval or Function, try to load it from URL +- String source = null; +- try { +- InputStream is = openSource(url); +- try { source = readSource(is); } +- finally { is.close(); } +- } catch (IOException ex) { +- System.err.println +- ("Failed to load source from "+url+": "+ ex); +- } +- if (source != null) { +- si = registerSource(url, source); +- } +- } +- } +- if (si != null) { +- item = registerScript(si, fnOrScript); +- } +- } +- return item; +- } +- + /* Debugger Interface */ + + public void handleCompilationDone(Context cx, DebuggableScript fnOrScript, +@@ -2490,7 +2649,7 @@ + + String getNormilizedUrl(DebuggableScript fnOrScript) { + String url = fnOrScript.getSourceName(); +- if (url == null) { url = "<stdin>"; } ++ if (url == null) { url = "document"; } + else { + // Not to produce window for eval from different lines, + // strip line numbers, i.e. replace all #[0-9]+\(eval\) by (eval) +@@ -2601,7 +2760,7 @@ + if (si == null) { + si = new SourceInfo(sourceUrl, source); + sourceNames.put(sourceUrl, si); +- } else { ++ } else if (!source.equals(si.getSource())) { + si.setSource(source); + } + } +@@ -2762,7 +2921,7 @@ + desk = new JDesktopPane(); + desk.setPreferredSize(new Dimension(600, 300)); + desk.setMinimumSize(new Dimension(150, 50)); +- desk.add(console = new JSInternalConsole("JavaScript Console")); ++ // desk.add(console = new JSInternalConsole("JavaScript Console")); + context = new ContextWindow(this); + context.setPreferredSize(new Dimension(600, 120)); + context.setMinimumSize(new Dimension(50, 50)); +@@ -2871,7 +3030,7 @@ + FrameHelper frame = contextData.getFrame(frameIndex); + String sourceName = frame.getUrl(); + if (sourceName == null || sourceName.equals("<stdin>")) { +- console.show(); ++ // console.show(); + helper.reset(); + return; + } +@@ -2895,6 +3054,19 @@ + int dispatcherIsWaiting = 0; + Context currentContext = null; + ++ // Flag used to establish whether source code editing is allowed in ++ // the debugger, switched on and off depending on whether a debug session ++ // is active ++ boolean sourceEditingEnabled = true; ++ ++ public boolean isSourceEditingEnabled() { ++ return sourceEditingEnabled; ++ } ++ ++ void setSourceEditingEnabled(boolean b) { ++ sourceEditingEnabled = b; ++ } ++ + Context getCurrentContext() { + return currentContext; + } +@@ -3028,14 +3200,14 @@ + swingInvoke(CreateFileWindow.action(this, si, line)); + } + } else { +- if (console.isVisible()) { ++ /* if (console.isVisible()) { + final JSInternalConsole finalConsole = console; + swingInvoke(new Runnable() { + public void run() { + finalConsole.show(); + } + }); +- } ++ } */ + } + swingInvoke(new EnterInterrupt(this, cx)); + swingInvoke(new UpdateContext(this, cx)); +@@ -3217,6 +3389,14 @@ + fileName)).start(); + } + } ++ } else if (cmd.equals("Run")) { ++ FileWindow w = (FileWindow)getSelectedFrame(); ++ if (w != null) ++ w.load(); ++ } else if (cmd.equals("Save")) { ++ FileWindow w = (FileWindow)getSelectedFrame(); ++ if (w != null) ++ w.save(); + } else if (cmd.equals("More Windows...")) { + MoreWindows dlg = new MoreWindows(this, fileWindows, + "Window", "Files"); +@@ -3509,6 +3689,60 @@ + } + } + ++ JInternalFrame getFrameForUrl( URL url ) ++ { ++ JInternalFrame[] frames = desk.getAllFrames(); ++ for (int i = 0; i < frames.length; i++) { ++ FileWindow w = (FileWindow)frames[i]; ++ if ( url.toString().equals( w.getUrl() ) ) { ++ return w; ++ } ++ } ++ return null; ++ } ++ public void highlighLineInSelectedWindow(URL url, int lineNum ){ ++ //FileWindow w = (FileWindow)getFrameForUrl( url ); ++ FileWindow w = (FileWindow)getSelectedFrame(); ++ if (w != null) ++ { ++ if ( lineNum > -1 ) ++ swingInvoke(new SetFilePosition(this, w, lineNum ) ); ++ } ++ } ++ public Object runSelectedWindow( URL scriptUrl ) throws Exception ++ { ++ Object result = null; ++ FileWindow w = (FileWindow)getSelectedFrame(); ++ //FileWindow w = (FileWindow)getFrameForUrl( scriptUrl ); ++ w.toFront(); ++ if (w != null) ++ { ++ Scriptable scope = w.db.getScope(); ++ if (scope == null) ++ { ++ MessageDialogWrapper.showMessageDialog(w.db, "Can't load scripts: no scope available", "Run", JOptionPane.ERROR_MESSAGE); ++ result = null; ++ } ++ else ++ { ++ String url = w.getUrl(); ++ Thread executorThread = null; ++ if (url != null) ++ { ++ LoadFile executor = new LoadFile(w.db,scope, url, new StringReader(w.textArea.getText()), true ); ++ executor.run(); ++ result = executor.result; ++ if ( executor.exception != null ) ++ { ++ throw executor.exception; ++ } ++ } ++ } ++ } ++ return result; ++ ++ } ++ + // + // public interface + // +@@ -3604,6 +3838,69 @@ + return console.getErr(); + } + ++ public void openFile(URL scriptUrl, Scriptable scope, Runnable closeCallback ) { ++ if (scope == null) { ++ MessageDialogWrapper.showMessageDialog(this, ++ "Can't compile scripts: no scope available", ++ "Open", JOptionPane.ERROR_MESSAGE); ++ } else { ++ if (scriptUrl != null) { ++ try ++ { ++ InputStreamReader reader = new InputStreamReader(scriptUrl.openStream()); ++ String fileName = null; ++ if ( scriptUrl.getProtocol().startsWith("vnd.sun.star.") ) ++ { ++ fileName = scriptUrl.toString(); ++ } ++ else ++ { ++ fileName = scriptUrl.getPath(); ++ } ++ officeScripts.addScript( fileName, scriptUrl, scope, closeCallback ); ++ //new Thread(new OpenFile(this, scope, fileName, reader )).start(); ++ swingInvoke( new OpenFile(this, fileName, reader )); ++ } ++ catch ( IOException e ) ++ { ++ MessageDialogWrapper.showMessageDialog(this, ++ "Can't open stream for script: " + e.toString(), ++ "Open", JOptionPane.ERROR_MESSAGE); ++ } ++ } ++ } ++ split1.setDividerLocation(1.0); ++ } ++ ++ public void openFile(String fileName) { ++ Scriptable scope = getScope(); ++ if (scope == null) { ++ MessageDialogWrapper.showMessageDialog(this, ++ "Can't compile scripts: no scope available", ++ "Open", JOptionPane.ERROR_MESSAGE); ++ } else { ++ if (fileName != null) { ++ new Thread(new OpenFile(this, fileName)).start(); ++ } ++ } ++ split1.setDividerLocation(1.0); ++ } ++ ++ public void openStream(InputStream in) { ++ Scriptable scope = getScope(); ++ if (scope == null) { ++ MessageDialogWrapper.showMessageDialog(this, ++ "Can't compile scripts: no scope available", ++ "Open", JOptionPane.ERROR_MESSAGE); ++ } else { ++ if (in != null) { ++ new Thread(new OpenFile(this, null, new InputStreamReader(in))).start(); ++ } ++ } ++ split1.setDividerLocation(1.0); ++ menubar.setSaveEnabled(false); ++ } ++ + public static void main(String[] args) { + try { + mainThread = Thread.currentThread(); +@@ -3635,5 +3932,162 @@ + } + } + ++ // patched Office specific interface ++ ++ OfficeScriptInfo officeScripts = new OfficeScriptInfo(); ++ ++ void removeScript( String url ) ++ { ++ // Remove the FileWindow from list of open sources ++ fileWindows.remove( url ); ++ ++ // Remove sourceInfo from sourceNames, ensures that ++ // breakpoints etc are deleted ++ synchronized (sourceNames) { ++ sourceNames.remove( url ); ++ } ++ // Removes scriptItems for the script, ensures that a new open ( from openFile ) ++ // will succeed, openFile should open file but fails due to fact that ++ synchronized ( scriptItems ) ++ { ++ Iterator iter = scriptItems.entrySet().iterator(); ++ while ( iter.hasNext() ) ++ { ++ Map.Entry me = ( Map.Entry )iter.next(); ++ ScriptItem item = (ScriptItem)me.getValue(); ++ SourceInfo si = item.getSourceInfo(); ++ if ( si.getUrl().equals( url ) ) ++ { ++ //match ++ scriptItems.remove( me.getKey() ); ++ break; ++ } ++ } ++ } ++ officeScripts.deleteScript( url ); ++ } ++ ++ ++ ScriptItem getScriptItem(DebuggableScript fnOrScript) { ++ ScriptItem item = (ScriptItem)scriptItems.get(fnOrScript); ++ if (item == null) { ++ String url = getNormilizedUrl(fnOrScript); ++ SourceInfo si = (SourceInfo)sourceNames.get(url); ++ if (si == null) { ++ if (!fnOrScript.isGeneratedScript()) { ++ // Not eval or Function, try to load it from URL ++ String source = null; ++ try { ++ InputStream is = openSource(url); ++ try { source = readSource(is); } ++ finally { is.close(); } ++ } catch (IOException ex) { ++ System.err.println ++ ("Failed to load source from "+url+": "+ ex); ++ } ++ if (source != null) { ++ si = registerSource(url, source); ++ } ++ } ++ } ++ if (si != null) { ++ item = registerScript(si, fnOrScript); ++ } ++ } ++ ++ return item; ++ } ++ ++ public void showScriptWindow(URL url ){ ++ String key = url.getPath(); ++ if ( url.getProtocol().startsWith("vnd.sun.star") ) ++ { ++ key = url.toString(); ++ } ++ FileWindow w = (FileWindow)getFileWindow( key ); ++ if ( w != null ) ++ { ++ //w.maximize(); ++ desk.getDesktopManager().deiconifyFrame(w); ++ desk.getDesktopManager().activateFrame(w); ++ w.show(); ++ w.toFront(); ++ } ++ } ++ ++ public void highlighLineInScriptWindow(URL url, int lineNum ){ ++ String key = url.getPath(); ++ if ( url.getProtocol().startsWith("vnd.sun.star") ) ++ { ++ key = url.getPath(); ++ } ++ FileWindow w = (FileWindow)getFileWindow( key ); ++ if (w != null) ++ { ++ if ( lineNum > -1 ) ++ swingInvoke(new SetFilePosition(this, w, lineNum ) ); ++ } ++ } ++ public Object runScriptWindow( URL scriptUrl ) throws Exception ++ { ++ String key = scriptUrl.getPath(); ++ if ( scriptUrl.getProtocol().startsWith("vnd.sun.star") ) ++ { ++ key = scriptUrl.toString(); ++ } ++ FileWindow w = (FileWindow)getFileWindow( key ); ++ Object result = null; ++ w.toFront(); ++ if (w != null) ++ { ++ //Scriptable scope = w.db.getScope(); ++ Scriptable scope = w.db.officeScripts.getScriptScope( key ); ++ if (scope == null) ++ { ++ MessageDialogWrapper.showMessageDialog(w.db, "Can't load scripts: no scope available", "Run", JOptionPane.ERROR_MESSAGE); ++ result = null; ++ } ++ else ++ { ++ String url = w.getUrl(); ++ Thread executorThread = null; ++ if (url != null) ++ { ++ LoadFile executor = new LoadFile(w.db,scope, url, new StringReader(w.textArea.getText()), true ); ++ executor.run(); ++ result = executor.result; ++ if ( executor.exception != null ) ++ { ++ throw executor.exception; ++ } ++ } ++ } ++ } ++ return result; ++ ++ } ++ ++ public boolean isModified( URL url ) ++ { ++ String key = url.getPath(); ++ if ( url.getProtocol().startsWith("vnd.sun.star") ) ++ { ++ key = url.toString(); ++ } ++ FileWindow w = (FileWindow)getFileWindow( key ); ++ return w.isModified(); ++ } ++ ++ public String getText( URL url ) ++ { ++ String key = url.toString(); ++ if ( url.getProtocol().startsWith("vnd.sun.star") ) ++ { ++ key = url.toString(); ++ } ++ FileWindow w = (FileWindow)getFileWindow( key ); ++ return w.getText(); ++ } ++ + } + +--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java Thu Mar 25 21:54:34 2004 ++++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java Fri Mar 28 17:24:23 2008 +@@ -36,6 +36,7 @@ + package org.mozilla.javascript.tools.shell; + + import java.security.*; ++import java.security.cert.Certificate; + import java.net.MalformedURLException; + import java.net.URL; + import java.util.Hashtable; +@@ -124,7 +125,7 @@ + + public JavaPolicySecurity() { + // To trigger error on jdk-1.1 with lazy load +- new CodeSource(null, null); ++ new CodeSource(null, (Certificate [])null); + } + + protected void callProcessFileSecure(final Context cx, +@@ -167,7 +168,7 @@ + } + + private ProtectionDomain getUrlDomain(URL url) { +- CodeSource cs = new CodeSource(url, null); ++ CodeSource cs = new CodeSource(url, (Certificate [])null); + PermissionCollection pc = Policy.getPolicy().getPermissions(cs); + return new ProtectionDomain(cs, pc); + } diff --git a/external/sane/README b/external/sane/README new file mode 100644 index 000000000..eda976da1 --- /dev/null +++ b/external/sane/README @@ -0,0 +1 @@ +Scanner library from [http://www.sane-project.org/] diff --git a/external/sane/inc/sane/sane.h b/external/sane/inc/sane/sane.h new file mode 100644 index 000000000..eb18eef1a --- /dev/null +++ b/external/sane/inc/sane/sane.h @@ -0,0 +1,213 @@ +/* sane - Scanner Access Now Easy. + Copyright (C) 1997 David Mosberger-Tang and Andreas Beck + This file is part of the SANE package. + + This file is in the public domain. You may use and modify it as + you see fit, as long as this copyright message is included and + that there is an indication as to what modifications have been + made (if any). + + SANE is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. + + This file declares SANE application interface. See the SANE + standard for a detailed explanation of the interface. */ +#ifndef sane_h +#define sane_h + +#define SANE_CURRENT_MAJOR 0 + +#define SANE_VERSION_CODE(major, minor, build) \ + ( (((SANE_Word) (major) & 0xff) << 24) \ + | (((SANE_Word) (minor) & 0xff) << 16) \ + | (((SANE_Word) (build) & 0xffff) << 0)) + +#define SANE_VERSION_MAJOR(code) ((((SANE_Word)(code)) >> 24) & 0xff) +#define SANE_VERSION_MINOR(code) ((((SANE_Word)(code)) >> 16) & 0xff) +#define SANE_VERSION_BUILD(code) ((((SANE_Word)(code)) >> 0) & 0xffff) + +#define SANE_FALSE 0 +#define SANE_TRUE 1 + +typedef unsigned char SANE_Byte; +typedef int SANE_Word; +typedef SANE_Word SANE_Bool; +typedef SANE_Word SANE_Int; +typedef char SANE_Char; +typedef SANE_Char *SANE_String; +typedef const SANE_Char *SANE_String_Const; +typedef void *SANE_Handle; +typedef SANE_Word SANE_Fixed; + +#define SANE_FIXED_SCALE_SHIFT 16 +#define SANE_FIX(v) ((SANE_Word) ((v) * (1 << SANE_FIXED_SCALE_SHIFT))) +#define SANE_UNFIX(v) ((double)(v) / (1 << SANE_FIXED_SCALE_SHIFT)) + +typedef enum + { + SANE_STATUS_GOOD = 0, /* everything A-OK */ + SANE_STATUS_UNSUPPORTED, /* operation is not supported */ + SANE_STATUS_CANCELLED, /* operation was cancelled */ + SANE_STATUS_DEVICE_BUSY, /* device is busy; try again later */ + SANE_STATUS_INVAL, /* data is invalid (includes no dev at open) */ + SANE_STATUS_EOF, /* no more data available (end-of-file) */ + SANE_STATUS_JAMMED, /* document feeder jammed */ + SANE_STATUS_NO_DOCS, /* document feeder out of documents */ + SANE_STATUS_COVER_OPEN, /* scanner cover is open */ + SANE_STATUS_IO_ERROR, /* error during device I/O */ + SANE_STATUS_NO_MEM, /* out of memory */ + SANE_STATUS_ACCESS_DENIED /* access to resource has been denied */ + } +SANE_Status; + +typedef enum + { + SANE_TYPE_BOOL = 0, + SANE_TYPE_INT, + SANE_TYPE_FIXED, + SANE_TYPE_STRING, + SANE_TYPE_BUTTON, + SANE_TYPE_GROUP + } +SANE_Value_Type; + +typedef enum + { + SANE_UNIT_NONE = 0, /* the value is unit-less (e.g., # of scans) */ + SANE_UNIT_PIXEL, /* value is number of pixels */ + SANE_UNIT_BIT, /* value is number of bits */ + SANE_UNIT_MM, /* value is millimeters */ + SANE_UNIT_DPI, /* value is resolution in dots/inch */ + SANE_UNIT_PERCENT, /* value is a percentage */ + SANE_UNIT_MICROSECOND /* value is micro seconds */ + } +SANE_Unit; + +typedef struct + { + SANE_String_Const name; /* unique device name */ + SANE_String_Const vendor; /* device vendor string */ + SANE_String_Const model; /* device model name */ + SANE_String_Const type; /* device type (e.g., "flatbed scanner") */ + } +SANE_Device; + +#define SANE_CAP_SOFT_SELECT (1 << 0) +#define SANE_CAP_HARD_SELECT (1 << 1) +#define SANE_CAP_SOFT_DETECT (1 << 2) +#define SANE_CAP_EMULATED (1 << 3) +#define SANE_CAP_AUTOMATIC (1 << 4) +#define SANE_CAP_INACTIVE (1 << 5) +#define SANE_CAP_ADVANCED (1 << 6) +#define SANE_CAP_ALWAYS_SETTABLE (1 << 7) + +#define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0) +#define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0) + +#define SANE_INFO_INEXACT (1 << 0) +#define SANE_INFO_RELOAD_OPTIONS (1 << 1) +#define SANE_INFO_RELOAD_PARAMS (1 << 2) + +typedef enum + { + SANE_CONSTRAINT_NONE = 0, + SANE_CONSTRAINT_RANGE, + SANE_CONSTRAINT_WORD_LIST, + SANE_CONSTRAINT_STRING_LIST + } +SANE_Constraint_Type; + +typedef struct + { + SANE_Word min; /* minimum (element) value */ + SANE_Word max; /* maximum (element) value */ + SANE_Word quant; /* quantization value (0 if none) */ + } +SANE_Range; + +typedef struct + { + SANE_String_Const name; /* name of this option (command-line name) */ + SANE_String_Const title; /* title of this option (single-line) */ + SANE_String_Const desc; /* description of this option (multi-line) */ + SANE_Value_Type type; /* how are values interpreted? */ + SANE_Unit unit; /* what is the (physical) unit? */ + SANE_Int size; + SANE_Int cap; /* capabilities */ + + SANE_Constraint_Type constraint_type; + union + { + const SANE_String_Const *string_list; /* NULL-terminated list */ + const SANE_Word *word_list; /* first element is list-length */ + const SANE_Range *range; + } + constraint; + } +SANE_Option_Descriptor; + +typedef enum + { + SANE_ACTION_GET_VALUE = 0, + SANE_ACTION_SET_VALUE, + SANE_ACTION_SET_AUTO + } +SANE_Action; + +typedef enum + { + SANE_FRAME_GRAY, /* band covering human visual range */ + SANE_FRAME_RGB, /* pixel-interleaved red/green/blue bands */ + SANE_FRAME_RED, /* red band only */ + SANE_FRAME_GREEN, /* green band only */ + SANE_FRAME_BLUE /* blue band only */ + } +SANE_Frame; + +typedef struct + { + SANE_Frame format; + SANE_Bool last_frame; + SANE_Int bytes_per_line; + SANE_Int pixels_per_line; + SANE_Int lines; + SANE_Int depth; + } +SANE_Parameters; + +struct SANE_Auth_Data; + +#define SANE_MAX_USERNAME_LEN 256 +#define SANE_MAX_PASSWORD_LEN 256 + +typedef void (*SANE_Auth_Callback) (SANE_String_Const resource, + SANE_Char username[SANE_MAX_USERNAME_LEN], + SANE_Char password[SANE_MAX_PASSWORD_LEN]); + +extern SANE_Status sane_init (SANE_Int * version_code, + SANE_Auth_Callback authorize); +extern void sane_exit (void); +extern SANE_Status sane_get_devices (const SANE_Device *** device_list, + SANE_Bool local_only); +extern SANE_Status sane_open (SANE_String_Const devicename, + SANE_Handle * handle); +extern void sane_close (SANE_Handle handle); +extern const SANE_Option_Descriptor * + sane_get_option_descriptor (SANE_Handle handle, SANE_Int option); +extern SANE_Status sane_control_option (SANE_Handle handle, SANE_Int option, + SANE_Action action, void *value, + SANE_Int * info); +extern SANE_Status sane_get_parameters (SANE_Handle handle, + SANE_Parameters * params); +extern SANE_Status sane_start (SANE_Handle handle); +extern SANE_Status sane_read (SANE_Handle handle, SANE_Byte * data, + SANE_Int max_length, SANE_Int * length); +extern void sane_cancel (SANE_Handle handle); +extern SANE_Status sane_set_io_mode (SANE_Handle handle, + SANE_Bool non_blocking); +extern SANE_Status sane_get_select_fd (SANE_Handle handle, + SANE_Int * fd); +extern SANE_String_Const sane_strstatus (SANE_Status status); + +#endif /* sane_h */ diff --git a/external/serf/ExternalProject_serf.mk b/external/serf/ExternalProject_serf.mk new file mode 100644 index 000000000..043045654 --- /dev/null +++ b/external/serf/ExternalProject_serf.mk @@ -0,0 +1,52 @@ +# -*- 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,serf)) + +$(eval $(call gb_ExternalProject_use_externals,serf,\ + apr \ +)) + +$(eval $(call gb_ExternalProject_register_targets,serf,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_nmake,serf,build)) + +ifeq ($(COM),MSC) +$(call gb_ExternalProject_get_state_target,serf,build): + $(call gb_Trace_StartRange,serf,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + APR_SRC="..\apr" \ + APRUTIL_SRC="..\apr_util" \ + OPENSSL_SRC="..\openssl" \ + ZLIB_SRC="..\zlib" \ + nmake -nologo -f serf.mak \ + $(if $(MSVC_USE_DEBUG_RUNTIME),DEBUG_BUILD=T Debug,Release)/serf-1.lib \ + ) + $(call gb_Trace_EndRange,serf,EXTERNAL) + +else +# serf is using SERF_LIBS variable, so pass it empty +$(call gb_ExternalProject_get_state_target,serf,build): + $(call gb_Trace_StartRange,serf,EXTERNAL) + +$(call gb_ExternalProject_run,build,\ + ./configure SERF_LIBS= \ + --enable-option-checking=fatal \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ + $(if $(SYSTEM_APR),,--with-apr=$(call gb_UnpackedTarball_get_dir,apr)/apr-1-config) \ + $(if $(SYSTEM_APR),,--with-apr-util=$(call gb_UnpackedTarball_get_dir,apr_util)/apu-1-config) \ + $(if $(SYSTEM_OPENSSL),,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \ + && $(MAKE) libserf-1.la \ + ) + $(call gb_Trace_EndRange,serf,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/serf/Makefile b/external/serf/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/serf/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/serf/Module_serf.mk b/external/serf/Module_serf.mk new file mode 100644 index 000000000..10ec03935 --- /dev/null +++ b/external/serf/Module_serf.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,serf)) + +$(eval $(call gb_Module_add_targets,serf,\ + UnpackedTarball_serf \ + ExternalProject_serf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/serf/README b/external/serf/README new file mode 100644 index 000000000..0cfe55fb2 --- /dev/null +++ b/external/serf/README @@ -0,0 +1,4 @@ +The serf library is a high performance C-based HTTP client library +built upon the Apache Portable Runtime (APR) library. + +From [http://code.google.com/p/serf/]. diff --git a/external/serf/UnpackedTarball_serf.mk b/external/serf/UnpackedTarball_serf.mk new file mode 100644 index 000000000..e6e950920 --- /dev/null +++ b/external/serf/UnpackedTarball_serf.mk @@ -0,0 +1,22 @@ +# -*- 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,serf)) + +$(eval $(call gb_UnpackedTarball_set_tarball,serf,$(SERF_TARBALL))) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,serf,\ + serf.mak \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,serf,\ + external/serf/windows.build.patch.1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/serf/windows.build.patch.1 b/external/serf/windows.build.patch.1 new file mode 100644 index 000000000..c659d41cd --- /dev/null +++ b/external/serf/windows.build.patch.1 @@ -0,0 +1,29 @@ +diff -ur serf.org/serf.mak serf/serf.mak +--- serf.org/serf.mak 2014-03-05 16:31:26.681695709 +0100 ++++ serf/serf.mak 2014-03-05 16:32:20.969696348 +0100 +@@ -93,7 +93,7 @@ + WIN32_DEFS = /D WIN32 /D WIN32_LEAN_AND_MEAN /D NOUSER /D NOGDI /D NONLS /D NOCRYPT /D SERF_HAVE_SSPI + + CPP=cl.exe +-CPP_PROJ = /c /nologo $(CFLAGS) $(WIN32_DEFS) $(APR_FLAGS) $(APRUTIL_FLAGS) $(OPENSSL_FLAGS) $(ZLIB_FLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" ++CPP_PROJ = /c /nologo /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC $(CFLAGS) $(WIN32_DEFS) $(APR_FLAGS) $(APRUTIL_FLAGS) $(OPENSSL_FLAGS) $(ZLIB_FLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" + LIB32=link.exe + LIB32_FLAGS=/nologo + +@@ -127,16 +127,6 @@ + "$(INTDIR)\socket_buckets.obj" \ + "$(INTDIR)\ssl_buckets.obj" \ + +-!IFDEF OPENSSL_STATIC +-LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32\libeay32.lib" \ +- "$(OPENSSL_SRC)\out32\ssleay32.lib" +-!ELSE +-LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32dll\libeay32.lib" \ +- "$(OPENSSL_SRC)\out32dll\ssleay32.lib" +-!ENDIF +- +-LIB32_OBJS = $(LIB32_OBJS) $(APR_LIBS) $(APRUTIL_LIBS) $(ZLIB_LIBS) +- + SYS_LIBS = secur32.lib + + TEST_OBJS = \ diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk new file mode 100644 index 000000000..1cd4adac9 --- /dev/null +++ b/external/skia/Library_skia.mk @@ -0,0 +1,853 @@ +# -*- 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_Library_Library,skia)) + +$(eval $(call gb_Library_set_warnings_disabled,skia)) + +$(eval $(call gb_Library_use_unpacked,skia,skia)) + +$(eval $(call gb_Library_use_clang,skia)) +$(eval $(call gb_Library_set_clang_precompiled_header,skia,external/skia/inc/pch/precompiled_skia)) + +$(eval $(call gb_Library_add_defs,skia,\ + -DSKIA_IMPLEMENTATION=1 \ + -DSKIA_DLL \ + -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \ +)) + +# SK_DEBUG controls runtime checks and is controlled by config_skia.h and depends on DBG_UTIL. +# This controls whether to build with compiler optimizations, normally yes, --enable-skia=debug +# allows to build non-optimized. We normally wouldn't debug a 3rd-party library, and Skia +# performance is relatively important (it may be the drawing engine used in software mode). +ifeq ($(ENABLE_SKIA_DEBUG),) +$(eval $(call gb_Library_add_cxxflags,skia, \ + $(gb_COMPILEROPTFLAGS) \ +)) +endif + +ifeq ($(OS),WNT) +# Skia can be built with or without UNICODE set, in LO sources we explicitly use the *W unicode +# variants, so build Skia with UNICODE to make it also use the *W variants. +$(eval $(call gb_Library_add_defs,skia,\ + -DUNICODE -D_UNICODE \ +)) +ifneq ($(gb_ENABLE_PCH),) +$(eval $(call gb_Library_add_cxxflags,skia, \ + -FIsrc/utils/win/SkDWriteNTDDI_VERSION.h \ +)) +endif + +$(eval $(call gb_Library_use_system_win32_libs,skia,\ + fontsub \ + ole32 \ + oleaut32 \ + user32 \ + usp10 \ + gdi32 \ +)) +else +$(eval $(call gb_Library_use_externals,skia,\ + freetype \ + fontconfig \ +)) +endif + +# we don't enable jpeg for skia, but it has incorrect #ifdef's in places +$(eval $(call gb_Library_use_externals,skia,\ + zlib \ + libjpeg \ + libpng \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_libs,skia,\ + -lm \ + -ldl \ + -lX11-xcb \ + -lX11 \ +)) +endif + +$(eval $(call gb_Library_use_libraries,skia,\ + sal \ +)) + +$(eval $(call gb_Library_set_include,skia,\ + $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,skia) \ + -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/skcms/ \ + -I$(call gb_UnpackedTarball_get_dir,skia)/third_party/vulkanmemoryallocator/ \ + -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan/ \ + -I$(SRCDIR)/external/skia/inc/ \ +)) + +$(eval $(call gb_Library_add_exception_objects,skia,\ + external/skia/source/SkMemory_malloc \ + external/skia/source/skia_compiler \ +)) + +$(eval $(call gb_Library_set_generated_cxx_suffix,skia,cpp)) + +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/codec/SkAndroidCodecAdapter \ + UnpackedTarball/skia/src/codec/SkAndroidCodec \ + UnpackedTarball/skia/src/codec/SkBmpBaseCodec \ + UnpackedTarball/skia/src/codec/SkBmpCodec \ + UnpackedTarball/skia/src/codec/SkBmpMaskCodec \ + UnpackedTarball/skia/src/codec/SkBmpRLECodec \ + UnpackedTarball/skia/src/codec/SkBmpStandardCodec \ + UnpackedTarball/skia/src/codec/SkCodec \ + UnpackedTarball/skia/src/codec/SkCodecImageGenerator \ + UnpackedTarball/skia/src/codec/SkColorTable \ + UnpackedTarball/skia/src/codec/SkEncodedInfo \ + UnpackedTarball/skia/src/codec/SkIcoCodec \ + UnpackedTarball/skia/src/codec/SkMasks \ + UnpackedTarball/skia/src/codec/SkMaskSwizzler \ + UnpackedTarball/skia/src/codec/SkParseEncodedOrigin \ + UnpackedTarball/skia/src/codec/SkPngCodec \ + UnpackedTarball/skia/src/codec/SkSampledCodec \ + UnpackedTarball/skia/src/codec/SkSampler \ + UnpackedTarball/skia/src/codec/SkStreamBuffer \ + UnpackedTarball/skia/src/codec/SkSwizzler \ + UnpackedTarball/skia/src/codec/SkWbmpCodec \ + UnpackedTarball/skia/src/core/SkAAClip \ + UnpackedTarball/skia/src/core/SkAlphaRuns \ + UnpackedTarball/skia/src/core/SkAnalyticEdge \ + UnpackedTarball/skia/src/core/SkAnnotation \ + UnpackedTarball/skia/src/core/SkArenaAlloc \ + UnpackedTarball/skia/src/core/SkATrace \ + UnpackedTarball/skia/src/core/SkAutoPixmapStorage \ + UnpackedTarball/skia/src/core/SkBBHFactory \ + UnpackedTarball/skia/src/core/SkBigPicture \ + UnpackedTarball/skia/src/core/SkBitmapCache \ + UnpackedTarball/skia/src/core/SkBitmapController \ + UnpackedTarball/skia/src/core/SkBitmap \ + UnpackedTarball/skia/src/core/SkBitmapDevice \ + UnpackedTarball/skia/src/core/SkBitmapProcState \ + UnpackedTarball/skia/src/core/SkBitmapProcState_matrixProcs \ + UnpackedTarball/skia/src/core/SkBlendMode \ + UnpackedTarball/skia/src/core/SkBlitRow_D32 \ + UnpackedTarball/skia/src/core/SkBlitter_ARGB32 \ + UnpackedTarball/skia/src/core/SkBlitter_A8 \ + UnpackedTarball/skia/src/core/SkBlitter \ + UnpackedTarball/skia/src/core/SkBlitter_RGB565 \ + UnpackedTarball/skia/src/core/SkBlitter_Sprite \ + UnpackedTarball/skia/src/core/SkBlurMask \ + UnpackedTarball/skia/src/core/SkBlurMF \ + UnpackedTarball/skia/src/core/SkBuffer \ + UnpackedTarball/skia/src/core/SkCachedData \ + UnpackedTarball/skia/src/core/SkCanvas \ + UnpackedTarball/skia/src/core/SkCanvasPriv \ + UnpackedTarball/skia/src/core/SkClipStack \ + UnpackedTarball/skia/src/core/SkClipStackDevice \ + UnpackedTarball/skia/src/core/SkColor \ + UnpackedTarball/skia/src/core/SkColorFilter \ + UnpackedTarball/skia/src/core/SkColorFilter_Matrix \ + UnpackedTarball/skia/src/core/SkColorSpace \ + UnpackedTarball/skia/src/core/SkColorSpaceXformSteps \ + UnpackedTarball/skia/src/core/SkCompressedDataUtils \ + UnpackedTarball/skia/src/core/SkContourMeasure \ + UnpackedTarball/skia/src/core/SkConvertPixels \ + UnpackedTarball/skia/src/core/SkCpu \ + UnpackedTarball/skia/src/core/SkCubicClipper \ + UnpackedTarball/skia/src/core/SkCubicMap \ + UnpackedTarball/skia/src/core/SkData \ + UnpackedTarball/skia/src/core/SkDataTable \ + UnpackedTarball/skia/src/core/SkDebug \ + UnpackedTarball/skia/src/core/SkDeferredDisplayList \ + UnpackedTarball/skia/src/core/SkDeferredDisplayListRecorder \ + UnpackedTarball/skia/src/core/SkDeque \ + UnpackedTarball/skia/src/core/SkDescriptor \ + UnpackedTarball/skia/src/core/SkDevice \ + UnpackedTarball/skia/src/core/SkDistanceFieldGen \ + UnpackedTarball/skia/src/core/SkDocument \ + UnpackedTarball/skia/src/core/SkDrawable \ + UnpackedTarball/skia/src/core/SkDraw \ + UnpackedTarball/skia/src/core/SkDrawLooper \ + UnpackedTarball/skia/src/core/SkDrawShadowInfo \ + UnpackedTarball/skia/src/core/SkDraw_atlas \ + UnpackedTarball/skia/src/core/SkDraw_text \ + UnpackedTarball/skia/src/core/SkDraw_vertices \ + UnpackedTarball/skia/src/core/SkEdgeBuilder \ + UnpackedTarball/skia/src/core/SkEdgeClipper \ + UnpackedTarball/skia/src/core/SkEdge \ + UnpackedTarball/skia/src/core/SkExecutor \ + UnpackedTarball/skia/src/core/SkFlattenable \ + UnpackedTarball/skia/src/core/SkFont \ + UnpackedTarball/skia/src/core/SkFont_serial \ + UnpackedTarball/skia/src/core/SkFontDescriptor \ + UnpackedTarball/skia/src/core/SkFontLCDConfig \ + UnpackedTarball/skia/src/core/SkFontMgr \ + UnpackedTarball/skia/src/core/SkFontStream \ + UnpackedTarball/skia/src/core/SkGaussFilter \ + UnpackedTarball/skia/src/core/SkGeometry \ + UnpackedTarball/skia/src/core/SkIDChangeListener \ + UnpackedTarball/skia/src/core/SkGlobalInitialization_core \ + UnpackedTarball/skia/src/core/SkGlyph \ + UnpackedTarball/skia/src/core/SkGlyphBuffer \ + UnpackedTarball/skia/src/core/SkGlyphRun \ + UnpackedTarball/skia/src/core/SkGlyphRunPainter \ + UnpackedTarball/skia/src/core/SkGraphics \ + UnpackedTarball/skia/src/core/SkHalf \ + UnpackedTarball/skia/src/core/SkICC \ + UnpackedTarball/skia/src/core/SkImageFilterCache \ + UnpackedTarball/skia/src/core/SkImageFilterTypes \ + UnpackedTarball/skia/src/core/SkImageFilter \ + UnpackedTarball/skia/src/core/SkImageGenerator \ + UnpackedTarball/skia/src/core/SkImageInfo \ + UnpackedTarball/skia/src/core/SkLatticeIter \ + UnpackedTarball/skia/src/core/SkLineClipper \ + UnpackedTarball/skia/src/core/SkLegacyGpuBlurUtils \ + UnpackedTarball/skia/src/core/SkLocalMatrixImageFilter \ + UnpackedTarball/skia/src/core/SkMalloc \ + UnpackedTarball/skia/src/core/SkMallocPixelRef \ + UnpackedTarball/skia/src/core/SkMarkerStack \ + UnpackedTarball/skia/src/core/SkMaskBlurFilter \ + UnpackedTarball/skia/src/core/SkMaskCache \ + UnpackedTarball/skia/src/core/SkMask \ + UnpackedTarball/skia/src/core/SkMaskFilter \ + UnpackedTarball/skia/src/core/SkMaskGamma \ + UnpackedTarball/skia/src/core/SkMath \ + UnpackedTarball/skia/src/core/SkMatrix \ + UnpackedTarball/skia/src/core/SkMatrixImageFilter \ + UnpackedTarball/skia/src/core/SkMatrix44 \ + UnpackedTarball/skia/src/core/SkM44 \ + UnpackedTarball/skia/src/core/SkMD5 \ + UnpackedTarball/skia/src/core/SkMiniRecorder \ + UnpackedTarball/skia/src/core/SkMipMap \ + UnpackedTarball/skia/src/core/SkModeColorFilter \ + UnpackedTarball/skia/src/core/SkOpts \ + UnpackedTarball/skia/src/core/SkOverdrawCanvas \ + UnpackedTarball/skia/src/core/SkPaint \ + UnpackedTarball/skia/src/core/SkPaintPriv \ + UnpackedTarball/skia/src/core/SkPath \ + UnpackedTarball/skia/src/core/SkPathBuilder \ + UnpackedTarball/skia/src/core/SkPathEffect \ + UnpackedTarball/skia/src/core/SkPathMeasure \ + UnpackedTarball/skia/src/core/SkPathRef \ + UnpackedTarball/skia/src/core/SkPath_serial \ + UnpackedTarball/skia/src/core/SkPicture \ + UnpackedTarball/skia/src/core/SkPictureData \ + UnpackedTarball/skia/src/core/SkPictureFlat \ + UnpackedTarball/skia/src/core/SkPictureImageGenerator \ + UnpackedTarball/skia/src/core/SkPicturePlayback \ + UnpackedTarball/skia/src/core/SkPictureRecord \ + UnpackedTarball/skia/src/core/SkPictureRecorder \ + UnpackedTarball/skia/src/core/SkPixelRef \ + UnpackedTarball/skia/src/core/SkPixmap \ + UnpackedTarball/skia/src/core/SkPoint \ + UnpackedTarball/skia/src/core/SkPoint3 \ + UnpackedTarball/skia/src/core/SkPromiseImageTexture \ + UnpackedTarball/skia/src/core/SkPtrRecorder \ + UnpackedTarball/skia/src/core/SkQuadClipper \ + UnpackedTarball/skia/src/core/SkRasterClip \ + UnpackedTarball/skia/src/core/SkRasterPipelineBlitter \ + UnpackedTarball/skia/src/core/SkRasterPipeline \ + UnpackedTarball/skia/src/core/SkReadBuffer \ + UnpackedTarball/skia/src/core/SkRecord \ + UnpackedTarball/skia/src/core/SkRecordDraw \ + UnpackedTarball/skia/src/core/SkRecordedDrawable \ + UnpackedTarball/skia/src/core/SkRecorder \ + UnpackedTarball/skia/src/core/SkRecordOpts \ + UnpackedTarball/skia/src/core/SkRecords \ + UnpackedTarball/skia/src/core/SkRect \ + UnpackedTarball/skia/src/core/SkRegion \ + UnpackedTarball/skia/src/core/SkRegion_path \ + UnpackedTarball/skia/src/core/SkRemoteGlyphCache \ + UnpackedTarball/skia/src/core/SkResourceCache \ + UnpackedTarball/skia/src/core/SkRRect \ + UnpackedTarball/skia/src/core/SkRTree \ + UnpackedTarball/skia/src/core/SkRuntimeEffect \ + UnpackedTarball/skia/src/core/SkRWBuffer \ + UnpackedTarball/skia/src/core/SkScalar \ + UnpackedTarball/skia/src/core/SkScalerCache \ + UnpackedTarball/skia/src/core/SkScalerContext \ + UnpackedTarball/skia/src/core/SkScan_AAAPath \ + UnpackedTarball/skia/src/core/SkScan_Antihair \ + UnpackedTarball/skia/src/core/SkScan_AntiPath \ + UnpackedTarball/skia/src/core/SkScan \ + UnpackedTarball/skia/src/core/SkScan_Hairline \ + UnpackedTarball/skia/src/core/SkScan_Path \ + UnpackedTarball/skia/src/core/SkSemaphore \ + UnpackedTarball/skia/src/core/SkSharedMutex \ + UnpackedTarball/skia/src/core/SkSpecialImage \ + UnpackedTarball/skia/src/core/SkSpecialSurface \ + UnpackedTarball/skia/src/core/SkSpinlock \ + UnpackedTarball/skia/src/core/SkSpriteBlitter_ARGB32 \ + UnpackedTarball/skia/src/core/SkSpriteBlitter_RGB565 \ + UnpackedTarball/skia/src/core/SkStream \ + UnpackedTarball/skia/src/core/SkStrikeCache \ + UnpackedTarball/skia/src/core/SkStrikeForGPU \ + UnpackedTarball/skia/src/core/SkStrikeSpec \ + UnpackedTarball/skia/src/core/SkString \ + UnpackedTarball/skia/src/core/SkStringUtils \ + UnpackedTarball/skia/src/core/SkStroke \ + UnpackedTarball/skia/src/core/SkStrokeRec \ + UnpackedTarball/skia/src/core/SkStrokerPriv \ + UnpackedTarball/skia/src/core/SkSurfaceCharacterization \ + UnpackedTarball/skia/src/core/SkSwizzle \ + UnpackedTarball/skia/src/core/SkTaskGroup \ + UnpackedTarball/skia/src/core/SkTextBlob \ + UnpackedTarball/skia/src/core/SkTextBlobTrace \ + UnpackedTarball/skia/src/core/SkThreadID \ + UnpackedTarball/skia/src/core/SkTime \ + UnpackedTarball/skia/src/core/SkTSearch \ + UnpackedTarball/skia/src/core/SkTypefaceCache \ + UnpackedTarball/skia/src/core/SkTypeface \ + UnpackedTarball/skia/src/core/SkTypeface_remote \ + UnpackedTarball/skia/src/core/SkUnPreMultiply \ + UnpackedTarball/skia/src/core/SkUtilsArm \ + UnpackedTarball/skia/src/core/SkUtils \ + UnpackedTarball/skia/src/core/SkVertices \ + UnpackedTarball/skia/src/core/SkVertState \ + UnpackedTarball/skia/src/core/SkVM \ + UnpackedTarball/skia/src/core/SkVMBlitter \ + UnpackedTarball/skia/src/core/SkWriteBuffer \ + UnpackedTarball/skia/src/core/SkWriter32 \ + UnpackedTarball/skia/src/core/SkXfermode \ + UnpackedTarball/skia/src/core/SkXfermodeInterpretation \ + UnpackedTarball/skia/src/core/SkYUVASizeInfo \ + UnpackedTarball/skia/src/core/SkYUVMath \ + UnpackedTarball/skia/src/core/SkYUVPlanesCache \ + UnpackedTarball/skia/src/c/sk_effects \ + UnpackedTarball/skia/src/c/sk_imageinfo \ + UnpackedTarball/skia/src/c/sk_paint \ + UnpackedTarball/skia/src/c/sk_surface \ + UnpackedTarball/skia/src/effects/imagefilters/SkAlphaThresholdFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkArithmeticImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkBlurImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkColorFilterImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkComposeImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkDisplacementMapEffect \ + UnpackedTarball/skia/src/effects/imagefilters/SkDropShadowImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkImageFilters \ + UnpackedTarball/skia/src/effects/imagefilters/SkImageSource \ + UnpackedTarball/skia/src/effects/imagefilters/SkLightingImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkMagnifierImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkMergeImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkMorphologyImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkOffsetImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkPaintImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkPictureImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkTileImageFilter \ + UnpackedTarball/skia/src/effects/imagefilters/SkXfermodeImageFilter \ + UnpackedTarball/skia/src/effects/SkColorMatrix \ + UnpackedTarball/skia/src/effects/SkColorMatrixFilter \ + UnpackedTarball/skia/src/effects/SkCornerPathEffect \ + UnpackedTarball/skia/src/effects/SkDashPathEffect \ + UnpackedTarball/skia/src/effects/SkDiscretePathEffect \ + UnpackedTarball/skia/src/effects/SkEmbossMask \ + UnpackedTarball/skia/src/effects/SkEmbossMaskFilter \ + UnpackedTarball/skia/src/effects/SkHighContrastFilter \ + UnpackedTarball/skia/src/effects/SkLayerDrawLooper \ + UnpackedTarball/skia/src/effects/SkLumaColorFilter \ + UnpackedTarball/skia/src/effects/SkOpPathEffect \ + UnpackedTarball/skia/src/effects/SkOverdrawColorFilter \ + UnpackedTarball/skia/src/effects/SkPackBits \ + UnpackedTarball/skia/src/effects/SkShaderMaskFilter \ + UnpackedTarball/skia/src/effects/SkTableColorFilter \ + UnpackedTarball/skia/src/effects/SkTableMaskFilter \ + UnpackedTarball/skia/src/effects/SkTrimPathEffect \ + UnpackedTarball/skia/src/effects/Sk1DPathEffect \ + UnpackedTarball/skia/src/effects/Sk2DPathEffect \ + UnpackedTarball/skia/src/fonts/SkRemotableFontMgr \ + UnpackedTarball/skia/src/image/SkImage \ + UnpackedTarball/skia/src/image/SkImage_Lazy \ + UnpackedTarball/skia/src/image/SkImage_Raster \ + UnpackedTarball/skia/src/image/SkSurface \ + UnpackedTarball/skia/src/image/SkSurface_Raster \ + UnpackedTarball/skia/src/images/SkImageEncoder \ + UnpackedTarball/skia/src/images/SkPngEncoder \ + UnpackedTarball/skia/src/images/SkWebpEncoder \ + UnpackedTarball/skia/src/lazy/SkDiscardableMemoryPool \ + UnpackedTarball/skia/src/pathops/SkAddIntersections \ + UnpackedTarball/skia/src/pathops/SkDConicLineIntersection \ + UnpackedTarball/skia/src/pathops/SkDCubicLineIntersection \ + UnpackedTarball/skia/src/pathops/SkDCubicToQuads \ + UnpackedTarball/skia/src/pathops/SkDLineIntersection \ + UnpackedTarball/skia/src/pathops/SkDQuadLineIntersection \ + UnpackedTarball/skia/src/pathops/SkIntersections \ + UnpackedTarball/skia/src/pathops/SkOpAngle \ + UnpackedTarball/skia/src/pathops/SkOpBuilder \ + UnpackedTarball/skia/src/pathops/SkOpCoincidence \ + UnpackedTarball/skia/src/pathops/SkOpContour \ + UnpackedTarball/skia/src/pathops/SkOpCubicHull \ + UnpackedTarball/skia/src/pathops/SkOpEdgeBuilder \ + UnpackedTarball/skia/src/pathops/SkOpSegment \ + UnpackedTarball/skia/src/pathops/SkOpSpan \ + UnpackedTarball/skia/src/pathops/SkPathOpsAsWinding \ + UnpackedTarball/skia/src/pathops/SkPathOpsCommon \ + UnpackedTarball/skia/src/pathops/SkPathOpsConic \ + UnpackedTarball/skia/src/pathops/SkPathOpsCubic \ + UnpackedTarball/skia/src/pathops/SkPathOpsCurve \ + UnpackedTarball/skia/src/pathops/SkPathOpsDebug \ + UnpackedTarball/skia/src/pathops/SkPathOpsLine \ + UnpackedTarball/skia/src/pathops/SkPathOpsOp \ + UnpackedTarball/skia/src/pathops/SkPathOpsQuad \ + UnpackedTarball/skia/src/pathops/SkPathOpsRect \ + UnpackedTarball/skia/src/pathops/SkPathOpsSimplify \ + UnpackedTarball/skia/src/pathops/SkPathOpsTightBounds \ + UnpackedTarball/skia/src/pathops/SkPathOpsTSect \ + UnpackedTarball/skia/src/pathops/SkPathOpsTypes \ + UnpackedTarball/skia/src/pathops/SkPathOpsWinding \ + UnpackedTarball/skia/src/pathops/SkPathWriter \ + UnpackedTarball/skia/src/pathops/SkReduceOrder \ + UnpackedTarball/skia/src/sfnt/SkOTTable_name \ + UnpackedTarball/skia/src/sfnt/SkOTUtils \ + UnpackedTarball/skia/src/shaders/gradients/SkGradientShader \ + UnpackedTarball/skia/src/shaders/gradients/SkLinearGradient \ + UnpackedTarball/skia/src/shaders/gradients/SkRadialGradient \ + UnpackedTarball/skia/src/shaders/gradients/SkSweepGradient \ + UnpackedTarball/skia/src/shaders/gradients/SkTwoPointConicalGradient \ + UnpackedTarball/skia/src/shaders/gradients/Sk4fGradientBase \ + UnpackedTarball/skia/src/shaders/gradients/Sk4fLinearGradient \ + UnpackedTarball/skia/src/shaders/SkBitmapProcShader \ + UnpackedTarball/skia/src/shaders/SkColorFilterShader \ + UnpackedTarball/skia/src/shaders/SkColorShader \ + UnpackedTarball/skia/src/shaders/SkComposeShader \ + UnpackedTarball/skia/src/shaders/SkImageShader \ + UnpackedTarball/skia/src/shaders/SkLocalMatrixShader \ + UnpackedTarball/skia/src/shaders/SkPerlinNoiseShader \ + UnpackedTarball/skia/src/shaders/SkPictureShader \ + UnpackedTarball/skia/src/shaders/SkShader \ + UnpackedTarball/skia/src/sksl/ir/SkSLSetting \ + UnpackedTarball/skia/src/sksl/ir/SkSLSymbolTable \ + UnpackedTarball/skia/src/sksl/ir/SkSLType \ + UnpackedTarball/skia/src/sksl/ir/SkSLVariableReference \ + UnpackedTarball/skia/src/sksl/SkSLASTNode \ + UnpackedTarball/skia/src/sksl/SkSLByteCode \ + UnpackedTarball/skia/src/sksl/SkSLByteCodeGenerator \ + UnpackedTarball/skia/src/sksl/SkSLCFGGenerator \ + UnpackedTarball/skia/src/sksl/SkSLCompiler \ + UnpackedTarball/skia/src/sksl/SkSLCPPCodeGenerator \ + UnpackedTarball/skia/src/sksl/SkSLCPPUniformCTypes \ + UnpackedTarball/skia/src/sksl/SkSLGLSLCodeGenerator \ + UnpackedTarball/skia/src/sksl/SkSLHCodeGenerator \ + UnpackedTarball/skia/src/sksl/SkSLIRGenerator \ + UnpackedTarball/skia/src/sksl/SkSLLexer \ + UnpackedTarball/skia/src/sksl/SkSLMetalCodeGenerator \ + UnpackedTarball/skia/src/sksl/SkSLOutputStream \ + UnpackedTarball/skia/src/sksl/SkSLParser \ + UnpackedTarball/skia/src/sksl/SkSLPipelineStageCodeGenerator \ + UnpackedTarball/skia/src/sksl/SkSLSampleMatrix \ + UnpackedTarball/skia/src/sksl/SkSLSPIRVCodeGenerator \ + UnpackedTarball/skia/src/sksl/SkSLSPIRVtoHLSL \ + UnpackedTarball/skia/src/sksl/SkSLSectionAndParameterHelper \ + UnpackedTarball/skia/src/sksl/SkSLString \ + UnpackedTarball/skia/src/sksl/SkSLUtil \ + UnpackedTarball/skia/src/utils/SkBase64 \ + UnpackedTarball/skia/src/utils/SkCamera \ + UnpackedTarball/skia/src/utils/SkCanvasStack \ + UnpackedTarball/skia/src/utils/SkCanvasStateUtils \ + UnpackedTarball/skia/src/utils/SkDashPath \ + UnpackedTarball/skia/src/utils/SkEventTracer \ + UnpackedTarball/skia/src/utils/SkFloatToDecimal \ + UnpackedTarball/skia/src/utils/SkCharToGlyphCache \ + UnpackedTarball/skia/src/utils/SkClipStackUtils \ + UnpackedTarball/skia/src/utils/SkCustomTypeface \ + UnpackedTarball/skia/src/utils/SkInterpolator \ + UnpackedTarball/skia/src/utils/SkJSON \ + UnpackedTarball/skia/src/utils/SkJSONWriter \ + UnpackedTarball/skia/src/utils/SkMatrix22 \ + UnpackedTarball/skia/src/utils/SkMultiPictureDocument \ + UnpackedTarball/skia/src/utils/SkNullCanvas \ + UnpackedTarball/skia/src/utils/SkNWayCanvas \ + UnpackedTarball/skia/src/utils/SkOSPath \ + UnpackedTarball/skia/src/utils/SkPaintFilterCanvas \ + UnpackedTarball/skia/src/utils/SkParseColor \ + UnpackedTarball/skia/src/utils/SkParse \ + UnpackedTarball/skia/src/utils/SkParsePath \ + UnpackedTarball/skia/src/utils/SkPatchUtils \ + UnpackedTarball/skia/src/utils/SkPolyUtils \ + UnpackedTarball/skia/src/utils/SkShadowTessellator \ + UnpackedTarball/skia/src/utils/SkShadowUtils \ + UnpackedTarball/skia/src/utils/SkShaperJSONWriter \ + UnpackedTarball/skia/src/utils/SkTextUtils \ + UnpackedTarball/skia/src/utils/SkThreadUtils_pthread \ + UnpackedTarball/skia/src/utils/SkThreadUtils_win \ + UnpackedTarball/skia/src/utils/SkUTF \ + UnpackedTarball/skia/src/utils/SkWhitelistTypefaces \ + UnpackedTarball/skia/src/xps/SkXPSDevice \ + UnpackedTarball/skia/src/xps/SkXPSDocument \ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/core/SkGpuBlurUtils \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCAtlas \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCClipPath \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCClipProcessor \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCConicShader \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCCoverageProcessor \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCCubicShader \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCDrawPathsOp \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCFiller \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCFillGeometry \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCPathCache \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCPathProcessor \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCPerFlushResources \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCQuadraticShader \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCStrokeGeometry \ + UnpackedTarball/skia/src/gpu/ccpr/GrCCStroker \ + UnpackedTarball/skia/src/gpu/ccpr/GrCoverageCountingPathRenderer \ + UnpackedTarball/skia/src/gpu/ccpr/GrGSCoverageProcessor \ + UnpackedTarball/skia/src/gpu/ccpr/GrOctoBounds \ + UnpackedTarball/skia/src/gpu/ccpr/GrSampleMaskProcessor \ + UnpackedTarball/skia/src/gpu/ccpr/GrStencilAtlasOp \ + UnpackedTarball/skia/src/gpu/ccpr/GrVSCoverageProcessor \ + UnpackedTarball/skia/src/gpu/effects/generated/GrAARectEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor \ + UnpackedTarball/skia/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor \ + UnpackedTarball/skia/src/gpu/effects/generated/GrCircleBlurFragmentProcessor \ + UnpackedTarball/skia/src/gpu/effects/generated/GrCircleEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrClampFragmentProcessor \ + UnpackedTarball/skia/src/gpu/effects/generated/GrColorMatrixFragmentProcessor \ + UnpackedTarball/skia/src/gpu/effects/generated/GrComposeLerpEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrConfigConversionEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrConstColorProcessor \ + UnpackedTarball/skia/src/gpu/effects/generated/GrEllipseEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrDeviceSpaceEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrHSLToRGBFilterEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrLumaColorFilterEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrMagnifierEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrMixerEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrOverrideInputFragmentProcessor \ + UnpackedTarball/skia/src/gpu/effects/generated/GrRectBlurEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrRGBToHSLFilterEffect \ + UnpackedTarball/skia/src/gpu/effects/generated/GrRRectBlurEffect \ + UnpackedTarball/skia/src/gpu/effects/GrBezierEffect \ + UnpackedTarball/skia/src/gpu/effects/GrBicubicEffect \ + UnpackedTarball/skia/src/gpu/effects/GrBitmapTextGeoProc \ + UnpackedTarball/skia/src/gpu/effects/GrConvexPolyEffect \ + UnpackedTarball/skia/src/gpu/effects/GrCoverageSetOpXP \ + UnpackedTarball/skia/src/gpu/effects/GrCustomXfermode \ + UnpackedTarball/skia/src/gpu/effects/GrDisableColorXP \ + UnpackedTarball/skia/src/gpu/effects/GrDistanceFieldGeoProc \ + UnpackedTarball/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor \ + UnpackedTarball/skia/src/gpu/effects/GrMatrixConvolutionEffect \ + UnpackedTarball/skia/src/gpu/effects/GrMatrixEffect \ + UnpackedTarball/skia/src/gpu/effects/GrOvalEffect \ + UnpackedTarball/skia/src/gpu/effects/GrPorterDuffXferProcessor \ + UnpackedTarball/skia/src/gpu/effects/GrRRectEffect \ + UnpackedTarball/skia/src/gpu/effects/GrShadowGeoProc \ + UnpackedTarball/skia/src/gpu/effects/GrSkSLFP \ + UnpackedTarball/skia/src/gpu/effects/GrTextureEffect \ + UnpackedTarball/skia/src/gpu/effects/GrXfermodeFragmentProcessor \ + UnpackedTarball/skia/src/gpu/effects/GrYUVtoRGBEffect \ + UnpackedTarball/skia/src/gpu/geometry/GrPathUtils \ + UnpackedTarball/skia/src/gpu/geometry/GrQuad \ + UnpackedTarball/skia/src/gpu/geometry/GrQuadUtils \ + UnpackedTarball/skia/src/gpu/geometry/GrShape \ + UnpackedTarball/skia/src/gpu/geometry/GrStyledShape \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLBlend \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSL \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLFragmentProcessor \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLGeometryProcessor \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLProgramBuilder \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLProgramDataManager \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLShaderBuilder \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLUniformHandler \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLVarying \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder \ + UnpackedTarball/skia/src/gpu/glsl/GrGLSLXferProcessor \ + UnpackedTarball/skia/src/gpu/gradients/generated/GrClampedGradientEffect \ + UnpackedTarball/skia/src/gpu/gradients/generated/GrDualIntervalGradientColorizer \ + UnpackedTarball/skia/src/gpu/gradients/generated/GrLinearGradientLayout \ + UnpackedTarball/skia/src/gpu/gradients/generated/GrRadialGradientLayout \ + UnpackedTarball/skia/src/gpu/gradients/generated/GrSingleIntervalGradientColorizer \ + UnpackedTarball/skia/src/gpu/gradients/generated/GrSweepGradientLayout \ + UnpackedTarball/skia/src/gpu/gradients/generated/GrTextureGradientColorizer \ + UnpackedTarball/skia/src/gpu/gradients/generated/GrTiledGradientEffect \ + UnpackedTarball/skia/src/gpu/gradients/generated/GrTwoPointConicalGradientLayout \ + UnpackedTarball/skia/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer \ + UnpackedTarball/skia/src/gpu/gradients/GrGradientBitmapCache \ + UnpackedTarball/skia/src/gpu/gradients/GrGradientShader \ + UnpackedTarball/skia/src/gpu/GrAHardwareBufferImageGenerator \ + UnpackedTarball/skia/src/gpu/GrAHardwareBufferUtils \ + UnpackedTarball/skia/src/gpu/GrAuditTrail \ + UnpackedTarball/skia/src/gpu/GrBackendSurface \ + UnpackedTarball/skia/src/gpu/GrBackendTextureImageGenerator \ + UnpackedTarball/skia/src/gpu/GrBitmapTextureMaker \ + UnpackedTarball/skia/src/gpu/GrBlockAllocator \ + UnpackedTarball/skia/src/gpu/GrBlurUtils \ + UnpackedTarball/skia/src/gpu/GrBufferAllocPool \ + UnpackedTarball/skia/src/gpu/GrCaps \ + UnpackedTarball/skia/src/gpu/GrClientMappedBufferManager \ + UnpackedTarball/skia/src/gpu/GrClipStackClip \ + UnpackedTarball/skia/src/gpu/GrColorInfo \ + UnpackedTarball/skia/src/gpu/GrColorSpaceXform \ + UnpackedTarball/skia/src/gpu/GrContext_Base \ + UnpackedTarball/skia/src/gpu/GrContext \ + UnpackedTarball/skia/src/gpu/GrContextPriv \ + UnpackedTarball/skia/src/gpu/GrContextThreadSafeProxy \ + UnpackedTarball/skia/src/gpu/GrCopyRenderTask \ + UnpackedTarball/skia/src/gpu/GrDataUtils \ + UnpackedTarball/skia/src/gpu/GrDDLContext \ + UnpackedTarball/skia/src/gpu/GrDefaultGeoProcFactory \ + UnpackedTarball/skia/src/gpu/GrDistanceFieldGenFromVector \ + UnpackedTarball/skia/src/gpu/GrDrawingManager \ + UnpackedTarball/skia/src/gpu/GrDrawOpAtlas \ + UnpackedTarball/skia/src/gpu/GrDrawOpTest \ + UnpackedTarball/skia/src/gpu/GrDriverBugWorkarounds \ + UnpackedTarball/skia/src/gpu/GrDynamicAtlas \ + UnpackedTarball/skia/src/gpu/GrFinishCallbacks \ + UnpackedTarball/skia/src/gpu/GrFixedClip \ + UnpackedTarball/skia/src/gpu/GrFragmentProcessor \ + UnpackedTarball/skia/src/gpu/GrGpu \ + UnpackedTarball/skia/src/gpu/GrGpuBuffer \ + UnpackedTarball/skia/src/gpu/GrGpuResource \ + UnpackedTarball/skia/src/gpu/GrImageContext \ + UnpackedTarball/skia/src/gpu/GrImageTextureMaker \ + UnpackedTarball/skia/src/gpu/GrLegacyDirectContext \ + UnpackedTarball/skia/src/gpu/GrManagedResource \ + UnpackedTarball/skia/src/gpu/GrMemoryPool \ + UnpackedTarball/skia/src/gpu/GrOnFlushResourceProvider \ + UnpackedTarball/skia/src/gpu/GrOpFlushState \ + UnpackedTarball/skia/src/gpu/GrOpsRenderPass \ + UnpackedTarball/skia/src/gpu/GrOpsTask \ + UnpackedTarball/skia/src/gpu/GrPaint \ + UnpackedTarball/skia/src/gpu/GrPath \ + UnpackedTarball/skia/src/gpu/GrPathProcessor \ + UnpackedTarball/skia/src/gpu/GrPathRenderer \ + UnpackedTarball/skia/src/gpu/GrPathRendererChain \ + UnpackedTarball/skia/src/gpu/GrPathRendering \ + UnpackedTarball/skia/src/gpu/GrPipeline \ + UnpackedTarball/skia/src/gpu/GrPrimitiveProcessor \ + UnpackedTarball/skia/src/gpu/GrProcessorAnalysis \ + UnpackedTarball/skia/src/gpu/GrProcessor \ + UnpackedTarball/skia/src/gpu/GrProcessorSet \ + UnpackedTarball/skia/src/gpu/GrProcessorUnitTest \ + UnpackedTarball/skia/src/gpu/GrProgramDesc \ + UnpackedTarball/skia/src/gpu/GrProgramInfo \ + UnpackedTarball/skia/src/gpu/GrProxyProvider \ + UnpackedTarball/skia/src/gpu/GrRecordingContext \ + UnpackedTarball/skia/src/gpu/GrRectanizerPow2 \ + UnpackedTarball/skia/src/gpu/GrRectanizerSkyline \ + UnpackedTarball/skia/src/gpu/GrRenderTask \ + UnpackedTarball/skia/src/gpu/GrReducedClip \ + UnpackedTarball/skia/src/gpu/GrRenderTargetContext \ + UnpackedTarball/skia/src/gpu/GrRenderTarget \ + UnpackedTarball/skia/src/gpu/GrRenderTargetProxy \ + UnpackedTarball/skia/src/gpu/GrResourceAllocator \ + UnpackedTarball/skia/src/gpu/GrResourceCache \ + UnpackedTarball/skia/src/gpu/GrResourceProvider \ + UnpackedTarball/skia/src/gpu/GrRingBuffer \ + UnpackedTarball/skia/src/gpu/GrSamplePatternDictionary \ + UnpackedTarball/skia/src/gpu/GrShaderCaps \ + UnpackedTarball/skia/src/gpu/GrShaderUtils \ + UnpackedTarball/skia/src/gpu/GrShaderVar \ + UnpackedTarball/skia/src/gpu/GrSoftwarePathRenderer \ + UnpackedTarball/skia/src/gpu/GrSPIRVUniformHandler \ + UnpackedTarball/skia/src/gpu/GrSPIRVVaryingHandler \ + UnpackedTarball/skia/src/gpu/GrStagingBuffer \ + UnpackedTarball/skia/src/gpu/GrStencilAttachment \ + UnpackedTarball/skia/src/gpu/GrStencilMaskHelper \ + UnpackedTarball/skia/src/gpu/GrStencilSettings \ + UnpackedTarball/skia/src/gpu/GrStyle \ + UnpackedTarball/skia/src/gpu/GrSurfaceContext \ + UnpackedTarball/skia/src/gpu/GrSurface \ + UnpackedTarball/skia/src/gpu/GrSurfaceProxy \ + UnpackedTarball/skia/src/gpu/GrSwizzle \ + UnpackedTarball/skia/src/gpu/GrSWMaskHelper \ + UnpackedTarball/skia/src/gpu/GrTestUtils \ + UnpackedTarball/skia/src/gpu/GrTriangulator \ + UnpackedTarball/skia/src/gpu/GrUniformDataManager \ + UnpackedTarball/skia/src/gpu/GrTextureAdjuster \ + UnpackedTarball/skia/src/gpu/GrTexture \ + UnpackedTarball/skia/src/gpu/GrTextureMaker \ + UnpackedTarball/skia/src/gpu/GrTextureProducer \ + UnpackedTarball/skia/src/gpu/GrTextureProxy \ + UnpackedTarball/skia/src/gpu/GrTextureRenderTargetProxy \ + UnpackedTarball/skia/src/gpu/GrTextureResolveRenderTask \ + UnpackedTarball/skia/src/gpu/GrTransferFromRenderTask \ + UnpackedTarball/skia/src/gpu/GrWaitRenderTask \ + UnpackedTarball/skia/src/gpu/GrXferProcessor \ + UnpackedTarball/skia/src/gpu/GrYUVProvider \ + UnpackedTarball/skia/src/gpu/mock/GrMockCaps \ + UnpackedTarball/skia/src/gpu/mock/GrMockGpu \ + UnpackedTarball/skia/src/gpu/mock/GrMockTypes \ + UnpackedTarball/skia/src/gpu/ops/GrAAConvexPathRenderer \ + UnpackedTarball/skia/src/gpu/ops/GrAAConvexTessellator \ + UnpackedTarball/skia/src/gpu/ops/GrAAHairLinePathRenderer \ + UnpackedTarball/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer \ + UnpackedTarball/skia/src/gpu/ops/GrAtlasTextOp \ + UnpackedTarball/skia/src/gpu/ops/GrClearOp \ + UnpackedTarball/skia/src/gpu/ops/GrDashLinePathRenderer \ + UnpackedTarball/skia/src/gpu/ops/GrDashOp \ + UnpackedTarball/skia/src/gpu/ops/GrDefaultPathRenderer \ + UnpackedTarball/skia/src/gpu/ops/GrDrawableOp \ + UnpackedTarball/skia/src/gpu/ops/GrDrawAtlasOp \ + UnpackedTarball/skia/src/gpu/ops/GrDrawPathOp \ + UnpackedTarball/skia/src/gpu/ops/GrDrawVerticesOp \ + UnpackedTarball/skia/src/gpu/ops/GrFillRectOp \ + UnpackedTarball/skia/src/gpu/ops/GrFillRRectOp \ + UnpackedTarball/skia/src/gpu/ops/GrLatticeOp \ + UnpackedTarball/skia/src/gpu/ops/GrMeshDrawOp \ + UnpackedTarball/skia/src/gpu/ops/GrOp \ + UnpackedTarball/skia/src/gpu/ops/GrOvalOpFactory \ + UnpackedTarball/skia/src/gpu/ops/GrQuadPerEdgeAA \ + UnpackedTarball/skia/src/gpu/ops/GrRegionOp \ + UnpackedTarball/skia/src/gpu/ops/GrShadowRRectOp \ + UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper \ + UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil \ + UnpackedTarball/skia/src/gpu/ops/GrSmallPathRenderer \ + UnpackedTarball/skia/src/gpu/ops/GrStencilAndCoverPathRenderer \ + UnpackedTarball/skia/src/gpu/ops/GrStencilPathOp \ + UnpackedTarball/skia/src/gpu/ops/GrStrokeRectOp \ + UnpackedTarball/skia/src/gpu/ops/GrTriangulatingPathRenderer \ + UnpackedTarball/skia/src/gpu/ops/GrTextureOp \ + UnpackedTarball/skia/src/gpu/SkGpuDevice \ + UnpackedTarball/skia/src/gpu/SkGpuDevice_drawTexture \ + UnpackedTarball/skia/src/gpu/SkGr \ + UnpackedTarball/skia/src/gpu/tessellate/GrDrawAtlasPathOp \ + UnpackedTarball/skia/src/gpu/tessellate/GrFillPathShader \ + UnpackedTarball/skia/src/gpu/tessellate/GrStencilPathShader \ + UnpackedTarball/skia/src/gpu/tessellate/GrStrokeGeometry \ + UnpackedTarball/skia/src/gpu/tessellate/GrTessellatePathOp \ + UnpackedTarball/skia/src/gpu/tessellate/GrTessellationPathRenderer \ + UnpackedTarball/skia/src/gpu/text/GrAtlasManager \ + UnpackedTarball/skia/src/gpu/text/GrDistanceFieldAdjustTable \ + UnpackedTarball/skia/src/gpu/text/GrSDFMaskFilter \ + UnpackedTarball/skia/src/gpu/text/GrSDFTOptions \ + UnpackedTarball/skia/src/gpu/text/GrStrikeCache \ + UnpackedTarball/skia/src/gpu/text/GrTextBlobCache \ + UnpackedTarball/skia/src/gpu/text/GrTextBlob \ + UnpackedTarball/skia/src/image/SkImage_GpuBase \ + UnpackedTarball/skia/src/image/SkImage_Gpu \ + UnpackedTarball/skia/src/image/SkImage_GpuYUVA \ + UnpackedTarball/skia/src/image/SkSurface_Gpu \ + UnpackedTarball/skia/src/gpu/vk/GrVkAMDMemoryAllocator \ + UnpackedTarball/skia/src/gpu/vk/GrVkBuffer \ + UnpackedTarball/skia/src/gpu/vk/GrVkCaps \ + UnpackedTarball/skia/src/gpu/vk/GrVkCommandBuffer \ + UnpackedTarball/skia/src/gpu/vk/GrVkCommandPool \ + UnpackedTarball/skia/src/gpu/vk/GrVkDescriptorPool \ + UnpackedTarball/skia/src/gpu/vk/GrVkDescriptorSet \ + UnpackedTarball/skia/src/gpu/vk/GrVkDescriptorSetManager \ + UnpackedTarball/skia/src/gpu/vk/GrVkExtensions \ + UnpackedTarball/skia/src/gpu/vk/GrVkFramebuffer \ + UnpackedTarball/skia/src/gpu/vk/GrVkGpu \ + UnpackedTarball/skia/src/gpu/vk/GrVkImage \ + UnpackedTarball/skia/src/gpu/vk/GrVkImageView \ + UnpackedTarball/skia/src/gpu/vk/GrVkInterface \ + UnpackedTarball/skia/src/gpu/vk/GrVkMemory \ + UnpackedTarball/skia/src/gpu/vk/GrVkMeshBuffer \ + UnpackedTarball/skia/src/gpu/vk/GrVkOpsRenderPass \ + UnpackedTarball/skia/src/gpu/vk/GrVkPipeline \ + UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateBuilder \ + UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateCache \ + UnpackedTarball/skia/src/gpu/vk/GrVkPipelineState \ + UnpackedTarball/skia/src/gpu/vk/GrVkPipelineStateDataManager \ + UnpackedTarball/skia/src/gpu/vk/GrVkRenderPass \ + UnpackedTarball/skia/src/gpu/vk/GrVkRenderTarget \ + UnpackedTarball/skia/src/gpu/vk/GrVkResourceProvider \ + UnpackedTarball/skia/src/gpu/vk/GrVkSampler \ + UnpackedTarball/skia/src/gpu/vk/GrVkSamplerYcbcrConversion \ + UnpackedTarball/skia/src/gpu/vk/GrVkSecondaryCBDrawContext \ + UnpackedTarball/skia/src/gpu/vk/GrVkSemaphore \ + UnpackedTarball/skia/src/gpu/vk/GrVkStencilAttachment \ + UnpackedTarball/skia/src/gpu/vk/GrVkTexture \ + UnpackedTarball/skia/src/gpu/vk/GrVkTextureRenderTarget \ + UnpackedTarball/skia/src/gpu/vk/GrVkTransferBuffer \ + UnpackedTarball/skia/src/gpu/vk/GrVkTypesPriv \ + UnpackedTarball/skia/src/gpu/vk/GrVkUniformBuffer \ + UnpackedTarball/skia/src/gpu/vk/GrVkUniformHandler \ + UnpackedTarball/skia/src/gpu/vk/GrVkUtil \ + UnpackedTarball/skia/src/gpu/vk/GrVkVaryingHandler \ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/ports/SkGlobalInitialization_default \ + UnpackedTarball/skia/src/ports/SkImageGenerator_none \ + UnpackedTarball/skia/src/ports/SkOSFile_stdio \ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/opts/SkOpts_avx, $(CXXFLAGS_INTRINSICS_AVX) $(CLANG_CXXFLAGS_INTRINSICS_AVX) \ +)) +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/opts/SkOpts_hsw, \ + $(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C) $(CXXFLAGS_INTRINSICS_FMA) \ + $(CLANG_CXXFLAGS_INTRINSICS_AVX2) $(CLANG_CXXFLAGS_INTRINSICS_F16C) $(CLANG_CXXFLAGS_INTRINSICS_FMA) \ +)) +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/opts/SkOpts_sse41, $(CXXFLAGS_INTRINSICS_SSE41) $(CLANG_CXXFLAGS_INTRINSICS_SSE41) \ +)) +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/opts/SkOpts_sse42, $(CXXFLAGS_INTRINSICS_SSE42) $(CLANG_CXXFLAGS_INTRINSICS_SSE42) \ +)) +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/opts/SkOpts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) $(CLANG_CXXFLAGS_INTRINSICS_SSSE3) \ +)) +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/opts/SkOpts_crc32 \ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/opts/SkOpts_skx, $(CXXFLAGS_INTRINSICS_AVX512) $(CLANG_CXXFLAGS_INTRINSICS_AVX512)\ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/tools/gpu/vk/VkTestUtils \ + UnpackedTarball/skia/tools/sk_app/VulkanWindowContext \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/ports/SkDebug_win \ + UnpackedTarball/skia/src/ports/SkFontHost_win \ + UnpackedTarball/skia/src/fonts/SkFontMgr_indirect \ + UnpackedTarball/skia/src/ports/SkFontMgr_win_dw \ + UnpackedTarball/skia/src/ports/SkFontMgr_win_dw_factory \ + UnpackedTarball/skia/src/ports/SkOSFile_win \ + UnpackedTarball/skia/src/ports/SkOSLibrary_win \ + UnpackedTarball/skia/src/ports/SkScalerContext_win_dw \ + UnpackedTarball/skia/src/ports/SkTypeface_win_dw \ + UnpackedTarball/skia/src/utils/win/SkAutoCoInitialize \ + UnpackedTarball/skia/src/utils/win/SkDWrite \ + UnpackedTarball/skia/src/utils/win/SkDWriteFontFileStream \ + UnpackedTarball/skia/src/utils/win/SkDWriteGeometrySink \ + UnpackedTarball/skia/src/utils/win/SkHRESULT \ + UnpackedTarball/skia/src/utils/win/SkIStream \ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/tools/sk_app/win/RasterWindowContext_win \ + UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win \ +)) +else +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/src/ports/SkDebug_stdio \ + UnpackedTarball/skia/src/ports/SkFontConfigInterface \ + UnpackedTarball/skia/src/ports/SkFontConfigInterface_direct \ + UnpackedTarball/skia/src/ports/SkFontConfigInterface_direct_factory \ + UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common \ + UnpackedTarball/skia/src/ports/SkFontHost_FreeType \ + UnpackedTarball/skia/src/ports/SkFontMgr_FontConfigInterface \ + UnpackedTarball/skia/src/ports/SkFontMgr_fontconfig \ + UnpackedTarball/skia/src/ports/SkFontMgr_fontconfig_factory \ + UnpackedTarball/skia/src/ports/SkOSFile_posix \ + UnpackedTarball/skia/src/ports/SkOSLibrary_posix \ +)) + +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/tools/sk_app/unix/RasterWindowContext_unix \ + UnpackedTarball/skia/tools/sk_app/unix/VulkanWindowContext_unix \ +)) +endif + +$(eval $(call gb_Library_add_generated_exception_objects,skia,\ + UnpackedTarball/skia/third_party/skcms/skcms \ + UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/skia/Makefile b/external/skia/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/skia/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/skia/Module_skia.mk b/external/skia/Module_skia.mk new file mode 100644 index 000000000..4cb8b5157 --- /dev/null +++ b/external/skia/Module_skia.mk @@ -0,0 +1,18 @@ +# -*- 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,skia)) + +$(eval $(call gb_Module_add_targets,skia,\ + UnpackedTarball_skia \ + Library_skia \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/external/skia/README b/external/skia/README new file mode 100644 index 000000000..ccd1be151 --- /dev/null +++ b/external/skia/README @@ -0,0 +1,27 @@ +External package containing skia. + +https://skia.org/ + + +How to update the tarball: +========================== + +git clone https://skia.googlesource.com/skia.git +cd skia +git checkout chrome/mXX +id=$(git rev-parse chrome/mXX) +git clean -idx +rm -rf .git gitignore infra modules/canvaskit resources site +cd .. +tar cvJf skia-mXX-$id.tar.xz skia + +(where XX refers to the branch version) + +And review differences for BUILD.gn and relevant files in gn/ : +git diff chrome/mYY..chrome/mXX ./BUILD.gn ./gn + + +GrContext sharing +================= + +For details about the share-grcontext patch, see vcl/skia/README. diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk new file mode 100644 index 000000000..5caeff270 --- /dev/null +++ b/external/skia/UnpackedTarball_skia.mk @@ -0,0 +1,53 @@ +# -*- 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,skia)) + +$(eval $(call gb_UnpackedTarball_set_tarball,skia,$(SKIA_TARBALL))) + +# * c++20.patch.0 has been reported upstream at +# <https://groups.google.com/forum/#!topic/skia-discuss/pYZQq_sLnv8> "C++20 operator== issue": +skia_patches := \ + lerp.patch \ + fix-pch.patch.1 \ + fix-ddi.patch \ + make-api-visible.patch.1 \ + no-trace-resources-on-exit.patch.1 \ + fix-alpha-difference-copy.patch.1 \ + libvulkan-name.patch.1 \ + share-grcontext.patch.1 \ + Wdeprecated-copy-dtor.patch.0 \ + fix-msvc.patch.1 \ + fix-gcc-x86.patch.1 \ + fix-sse.patch.1 \ + clang11-flax-vector-conversion.patch.0 \ + clang-attributes-warning.patch.1 \ + fontconfig-get-typeface.patch.0 \ + windows-do-not-modify-logfont.patch.0 \ + windows-text-gamma.patch.0 \ + windows-force-unicode-api.patch.0 \ + operator-eq-bool.patch.1 \ + fix-without-gl.patch.0 \ + extend-rgb-to-rgba.patch.0 \ + windows-typeface-directwrite.patch.0 \ + windows-raster-surface-no-copies.patch.1 \ + fix-windows-dwrite.patch.1 \ + public-make-from-backend-texture.patch.1 \ + +$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,skia,\ + $(foreach patch,$(skia_patches),external/skia/$(patch)) \ +)) + +$(eval $(call gb_UnpackedTarball_set_post_action,skia,\ + mv third_party/skcms/skcms.cc third_party/skcms/skcms.cpp \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/skia/Wdeprecated-copy-dtor.patch.0 b/external/skia/Wdeprecated-copy-dtor.patch.0 new file mode 100644 index 000000000..710fe9c24 --- /dev/null +++ b/external/skia/Wdeprecated-copy-dtor.patch.0 @@ -0,0 +1,21 @@ +--- include/gpu/GrDriverBugWorkarounds.h ++++ include/gpu/GrDriverBugWorkarounds.h +@@ -35,6 +35,7 @@ + public: + GrDriverBugWorkarounds(); + explicit GrDriverBugWorkarounds(const std::vector<int32_t>& workarounds); ++ GrDriverBugWorkarounds(GrDriverBugWorkarounds const &) = default; + + GrDriverBugWorkarounds& operator=(const GrDriverBugWorkarounds&) = default; + +--- tools/sk_app/VulkanWindowContext.h ++++ tools/sk_app/VulkanWindowContext.h +@@ -33,6 +33,8 @@ + SharedGrContext() {} + GrContext* getGrContext() { return shared ? shared->fContext.get() : nullptr; } + ~SharedGrContext() { shared.reset(); checkDestroyShared(); } ++ SharedGrContext(SharedGrContext const &) = default; ++ SharedGrContext & operator =(SharedGrContext const &) = default; + bool operator!() const { return !shared; } + void reset() { shared.reset(); } + private: diff --git a/external/skia/clang-attributes-warning.patch.1 b/external/skia/clang-attributes-warning.patch.1 new file mode 100644 index 000000000..1e30e290b --- /dev/null +++ b/external/skia/clang-attributes-warning.patch.1 @@ -0,0 +1,31 @@ +diff --git a/include/private/SkFloatingPoint.h b/include/private/SkFloatingPoint.h +index 110dda2ae4..530634b815 100644 +--- a/include/private/SkFloatingPoint.h ++++ b/include/private/SkFloatingPoint.h +@@ -159,7 +159,9 @@ static inline int64_t sk_float_saturate2int64(float x) { + // Cast double to float, ignoring any warning about too-large finite values being cast to float. + // Clang thinks this is undefined, but it's actually implementation defined to return either + // the largest float or infinity (one of the two bracketing representable floats). Good enough! ++#if defined(__clang__) + [[clang::no_sanitize("float-cast-overflow")]] ++#endif + static inline float sk_double_to_float(double x) { + return static_cast<float>(x); + } +@@ -226,12 +228,16 @@ static inline float sk_float_rsqrt(float x) { + // IEEE defines how float divide behaves for non-finite values and zero-denoms, but C does not + // so we have a helper that suppresses the possible undefined-behavior warnings. + ++#if defined(__clang__) + [[clang::no_sanitize("float-divide-by-zero")]] ++#endif + static inline float sk_ieee_float_divide(float numer, float denom) { + return numer / denom; + } + ++#if defined(__clang__) + [[clang::no_sanitize("float-divide-by-zero")]] ++#endif + static inline double sk_ieee_double_divide(double numer, double denom) { + return numer / denom; + } diff --git a/external/skia/clang11-flax-vector-conversion.patch.0 b/external/skia/clang11-flax-vector-conversion.patch.0 new file mode 100644 index 000000000..40cf4e0a4 --- /dev/null +++ b/external/skia/clang11-flax-vector-conversion.patch.0 @@ -0,0 +1,11 @@ +--- src/opts/SkRasterPipeline_opts.h ++++ src/opts/SkRasterPipeline_opts.h +@@ -68,7 +68,7 @@ + }; + + +-#if !defined(__clang__) ++#if !defined(__clang__) || __clang_major__ >= 11 + #define JUMPER_IS_SCALAR + #elif defined(SK_ARM_HAS_NEON) + #define JUMPER_IS_NEON diff --git a/external/skia/extend-rgb-to-rgba.patch.0 b/external/skia/extend-rgb-to-rgba.patch.0 new file mode 100644 index 000000000..f68dbab96 --- /dev/null +++ b/external/skia/extend-rgb-to-rgba.patch.0 @@ -0,0 +1,23 @@ +diff --git a/include/core/SkSwizzle.h b/include/core/SkSwizzle.h +index 61e93b2da7..c19063bb91 100644 +--- ./include/core/SkSwizzle.h ++++ ./include/core/SkSwizzle.h +@@ -16,4 +16,6 @@ + */ + SK_API void SkSwapRB(uint32_t* dest, const uint32_t* src, int count); + ++SK_API void SkExtendRGBToRGBA(uint32_t* dest, const uint8_t* src, int count); ++ + #endif +diff --git a/src/core/SkSwizzle.cpp b/src/core/SkSwizzle.cpp +index 301b0184f1..6e6dd27558 100644 +--- ./src/core/SkSwizzle.cpp ++++ ./src/core/SkSwizzle.cpp +@@ -12,3 +12,7 @@ + void SkSwapRB(uint32_t* dest, const uint32_t* src, int count) { + SkOpts::RGBA_to_BGRA(dest, src, count); + } ++ ++void SkExtendRGBToRGBA(uint32_t* dest, const uint8_t* src, int count) { ++ SkOpts::RGB_to_RGB1(dest, src, count); ++} diff --git a/external/skia/fix-alpha-difference-copy.patch.1 b/external/skia/fix-alpha-difference-copy.patch.1 new file mode 100644 index 000000000..61a61e621 --- /dev/null +++ b/external/skia/fix-alpha-difference-copy.patch.1 @@ -0,0 +1,13 @@ +diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp +index df7d9a7025..7f94c2a660 100644 +--- a/src/core/SkBlitter_Sprite.cpp ++++ b/src/core/SkBlitter_Sprite.cpp +@@ -191,7 +191,7 @@ SkBlitter* SkBlitter::ChooseSprite(const SkPixmap& dst, const SkPaint& paint, + } + + // TODO: in principle SkRasterPipelineSpriteBlitter could be made to handle this. +- if (source.alphaType() == kUnpremul_SkAlphaType) { ++ if (source.alphaType() != dst.alphaType()) { + return nullptr; + } + diff --git a/external/skia/fix-ddi.patch b/external/skia/fix-ddi.patch new file mode 100644 index 000000000..f827c1d69 --- /dev/null +++ b/external/skia/fix-ddi.patch @@ -0,0 +1,9 @@ +--- skia/src/utils/win/SkDWriteNTDDI_VERSION.h.sav 2019-08-15 21:59:46.000000000 +0200 ++++ skia/src/utils/win/SkDWriteNTDDI_VERSION.h 2019-09-26 15:30:36.395622200 +0200 +@@ -28,4 +28,6 @@ + # endif + #endif + ++#define NTDDI_VERSION 0x0A000002 // NTDDI_WIN10_RS1 ++ + #endif diff --git a/external/skia/fix-gcc-x86.patch.1 b/external/skia/fix-gcc-x86.patch.1 new file mode 100644 index 000000000..097c59475 --- /dev/null +++ b/external/skia/fix-gcc-x86.patch.1 @@ -0,0 +1,16 @@ +--- skia/third_party/skcms/src/Transform_inl.h 2020-04-13 00:38:56.363207994 +0200 ++++ skia/third_party/skcms/src/Transform_inl.h~ 2020-04-13 00:39:18.215603244 +0200 +@@ -689,11 +689,11 @@ + && (defined(__mips64) || defined(__i386) || defined(__s390x__)) + #define MAYBE_NOINLINE __attribute__((noinline)) + #else +- #define MAYBE_NOINLINE ++ #define MAYBE_NOINLINE static + #endif + + MAYBE_NOINLINE +-static void clut(const skcms_A2B* a2b, F* r, F* g, F* b, F a) { ++void clut(const skcms_A2B* a2b, F* r, F* g, F* b, F a) { + const int dim = (int)a2b->input_channels; + assert (0 < dim && dim <= 4); + diff --git a/external/skia/fix-msvc.patch.1 b/external/skia/fix-msvc.patch.1 new file mode 100644 index 000000000..ffbf19883 --- /dev/null +++ b/external/skia/fix-msvc.patch.1 @@ -0,0 +1,13 @@ +diff --git a/src/gpu/GrFragmentProcessor.h b/src/gpu/GrFragmentProcessor.h +index 03d22aeaae..0f91f6f73c 100644 +--- a/src/gpu/GrFragmentProcessor.h ++++ b/src/gpu/GrFragmentProcessor.h +@@ -603,7 +603,7 @@ public: + operator bool() const { return fFPIter; } + bool operator!=(const FPItemEndIter&) { return (bool)*this; } + +- FPItemIter(const FPItemIter&) = delete; ++ FPItemIter(const FPItemIter&) = default; + FPItemIter& operator=(const FPItemIter&) = delete; + + private: diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1 new file mode 100644 index 000000000..9c89edbfe --- /dev/null +++ b/external/skia/fix-pch.patch.1 @@ -0,0 +1,123 @@ +diff --git a/include/core/SkColor.h b/include/core/SkColor.h +index 53df435e46..ce74db8b27 100644 +--- a/include/core/SkColor.h ++++ b/include/core/SkColor.h +@@ -400,6 +400,7 @@ using SkColor4f = SkRGBA4f<kUnpremul_SkAlphaType>; + + template <> SK_API SkColor4f SkColor4f::FromColor(SkColor); + template <> SK_API SkColor SkColor4f::toSkColor() const; ++template <> uint32_t SkColor4f::toBytes_RGBA() const; + + namespace SkColors { + constexpr SkColor4f kTransparent = {0, 0, 0, 0}; +diff --git a/include/private/SkColorData.h b/include/private/SkColorData.h +index 2090ab4b7e..801511586f 100644 +--- a/include/private/SkColorData.h ++++ b/include/private/SkColorData.h +@@ -441,4 +441,6 @@ constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity, + SK_FloatNegativeInfinity, + SK_FloatNegativeInfinity }; + ++template <> uint32_t SkPMColor4f::toBytes_RGBA() const; ++ + #endif +diff --git a/src/gpu/text/GrTextBlobCache.h b/src/gpu/text/GrTextBlobCache.h +index 1484cee527..dcb53b20a1 100644 +--- a/src/gpu/text/GrTextBlobCache.h ++++ b/src/gpu/text/GrTextBlobCache.h +@@ -197,4 +197,6 @@ private: + SkMessageBus<PurgeBlobMessage>::Inbox fPurgeBlobInbox; + }; + ++template<> SkMessageBus<GrTextBlobCache::PurgeBlobMessage>* SkMessageBus<GrTextBlobCache::PurgeBlobMessage>::Get(); ++ + #endif +diff --git a/src/gpu/vk/GrVkSemaphore.cpp b/src/gpu/vk/GrVkSemaphore.cpp +index 191b6a3ce5..26754acccd 100644 +--- a/src/gpu/vk/GrVkSemaphore.cpp ++++ b/src/gpu/vk/GrVkSemaphore.cpp +@@ -10,6 +10,7 @@ + #include "include/gpu/GrBackendSemaphore.h" + #include "src/gpu/vk/GrVkGpu.h" + #include "src/gpu/vk/GrVkUtil.h" ++#include "tools/gpu/vk/GrVulkanDefines.h" + + #ifdef VK_USE_PLATFORM_WIN32_KHR + // windows wants to define this as CreateSemaphoreA or CreateSemaphoreW +diff --git a/src/utils/win/SkDWriteGeometrySink.h b/src/utils/win/SkDWriteGeometrySink.h +index 019539b191..5dd7bef353 100644 +--- a/src/utils/win/SkDWriteGeometrySink.h ++++ b/src/utils/win/SkDWriteGeometrySink.h +@@ -13,6 +13,8 @@ + + class SkPath; + ++#define CONST const ++ + #include <dwrite.h> + #include <d2d1.h> + +diff --git a/third_party/skcms/skcms.cc b/third_party/skcms/skcms.cc +index cc5738d977..c67310f6cc 100644 +--- a/third_party/skcms/skcms.cc ++++ b/third_party/skcms/skcms.cc +@@ -124,7 +124,8 @@ static float minus_1_ulp(float x) { + // Most transfer functions we work with are sRGBish. + // For exotic HDR transfer functions, we encode them using a tf.g that makes no sense, + // and repurpose the other fields to hold the parameters of the HDR functions. +-enum TFKind { Bad, sRGBish, PQish, HLGish, HLGinvish }; ++enum TFKind_skcms { Bad, sRGBish, PQish, HLGish, HLGinvish }; ++#define TFKind TFKind_skcms + struct TF_PQish { float A,B,C,D,E,F; }; + struct TF_HLGish { float R,G,a,b,c; }; + +@@ -2011,7 +2012,9 @@ typedef enum { + Op_store_hhhh, + Op_store_fff, + Op_store_ffff, +-} Op; ++} Op_skcms; ++ ++#define Op Op_skcms + + #if defined(__clang__) + template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N))); +diff --git a/src/core/SkM44.cpp b/src/core/SkM44.cpp +index 2c82a0abd7..8505253d12 100644 +--- a/src/core/SkM44.cpp ++++ b/src/core/SkM44.cpp +@@ -300,6 +300,8 @@ SkM44 Sk3LookAt(const SkV3& eye, const SkV3& center, const SkV3& up) { + return m; + } + ++#undef near ++#undef far + SkM44 Sk3Perspective(float near, float far, float angle) { + SkASSERT(far > near); + +diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp +index b8fd426e13..5e6f2a9b28 100755 +--- a/src/shaders/SkImageShader.cpp ++++ b/src/shaders/SkImageShader.cpp +@@ -808,6 +808,8 @@ skvm::Color SkImageShader::onProgram(skv + + // See GrCubicEffect for details of these weights. + // TODO: these maybe don't seem right looking at gm/bicubic and GrBicubicEffect. ++#undef near ++#undef far + auto near = [&](skvm::F32 t) { + // 1/18 + 9/18t + 27/18t^2 - 21/18t^3 == t ( t ( -21/18t + 27/18) + 9/18) + 1/18 + return t * (t * (t * (-21/18.0f) + 27/18.0f) + 9/18.0f) + 1/18.0f; +diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp +index 191b6a3ce5..26754acccd 100644 +--- a/src/gpu/gl/GrGLGpu.cpp ++++ b/src/gpu/gl/GrGLGpu.cpp +@@ -3766,6 +3766,8 @@ + } + } + ++#undef MemoryBarrier ++ + void GrGLGpu::insertManualFramebufferBarrier() { + SkASSERT(this->caps()->requiresManualFBBarrierAfterTessellatedStencilDraw()); + GL_CALL(MemoryBarrier(GR_GL_FRAMEBUFFER_BARRIER_BIT)); diff --git a/external/skia/fix-sse.patch.1 b/external/skia/fix-sse.patch.1 new file mode 100644 index 000000000..8a731725e --- /dev/null +++ b/external/skia/fix-sse.patch.1 @@ -0,0 +1,23 @@ +--- a/src/opts/SkRasterPipeline_opts.h ++++ b/src/opts/SkRasterPipeline_opts.h +@@ -1047,7 +1047,7 @@ static const size_t N = sizeof(F) / sizeof(float); + // TODO: crashes during compilation :( + #define ABI __attribute__((sysv_abi)) + #define JUMPER_NARROW_STAGES 0 +-#elif defined(_MSC_VER) ++#elif defined(_MSC_VER) && SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 + // Even if not vectorized, this lets us pass {r,g,b,a} as registers, + // instead of {b,a} on the stack. Narrow stages work best for __vectorcall. + #define ABI __vectorcall +--- a/include/private/SkVx.h ++++ b/include/private/SkVx.h +@@ -515,9 +515,6 @@ static inline Vec<N,uint8_t> approx_scale(const Vec<N,uint8_t>& x, const Vec<N,u + static inline Vec<4,float> rcp(const Vec<4,float>& x) { + return bit_pun<Vec<4,float>>(_mm_rcp_ps(bit_pun<__m128>(x))); + } +- static inline Vec<4,int> lrint(const Vec<4,float>& x) { +- return bit_pun<Vec<4,int>>(_mm_cvtps_epi32(bit_pun<__m128>(x))); +- } + + static inline Vec<2,float> sqrt(const Vec<2,float>& x) { + return shuffle<0,1>( sqrt(shuffle<0,1,0,1>(x))); diff --git a/external/skia/fix-windows-dwrite.patch.1 b/external/skia/fix-windows-dwrite.patch.1 new file mode 100644 index 000000000..482fa8b40 --- /dev/null +++ b/external/skia/fix-windows-dwrite.patch.1 @@ -0,0 +1,20 @@ +diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp +index 6a4748f91c..50086a7780 100644 +--- a/src/ports/SkFontMgr_win_dw.cpp ++++ b/src/ports/SkFontMgr_win_dw.cpp +@@ -361,6 +361,7 @@ static bool FindByDWriteFont(SkTypeface* cached, void* ctx) { + DWriteFontTypeface* cshFace = reinterpret_cast<DWriteFontTypeface*>(cached); + ProtoDWriteTypeface* ctxFace = reinterpret_cast<ProtoDWriteTypeface*>(ctx); + ++#if defined(NTDDI_WIN10_RS3) && NTDDI_VERSION >= NTDDI_WIN10_RS3 + // IDWriteFontFace5 introduced both Equals and HasVariations + SkTScopedComPtr<IDWriteFontFace5> cshFontFace5; + SkTScopedComPtr<IDWriteFontFace5> ctxFontFace5; +@@ -369,6 +370,7 @@ static bool FindByDWriteFont(SkTypeface* cached, void* ctx) { + if (cshFontFace5 && ctxFontFace5) { + return cshFontFace5->Equals(ctxFontFace5.get()); + } ++#endif + + bool same; + diff --git a/external/skia/fix-without-gl.patch.0 b/external/skia/fix-without-gl.patch.0 new file mode 100644 index 000000000..0729162b2 --- /dev/null +++ b/external/skia/fix-without-gl.patch.0 @@ -0,0 +1,47 @@ +diff --git a/include/gpu/GrBackendSurface.h b/include/gpu/GrBackendSurface.h +index 378646ebc1..af3b9ce290 100644 +--- ./include/gpu/GrBackendSurface.h ++++ ./include/gpu/GrBackendSurface.h +@@ -74,9 +74,11 @@ public: + GrBackendFormat(const GrBackendFormat&); + GrBackendFormat& operator=(const GrBackendFormat&); + ++#ifdef SK_GL + static GrBackendFormat MakeGL(GrGLenum format, GrGLenum target) { + return GrBackendFormat(format, target); + } ++#endif + + static GrBackendFormat MakeVk(VkFormat format) { + return GrBackendFormat(format, GrVkYcbcrConversionInfo()); +diff --git a/include/gpu/gl/GrGLInterface.h b/include/gpu/gl/GrGLInterface.h +index 17655bdbed..ce0641f423 100644 +--- ./include/gpu/gl/GrGLInterface.h ++++ ./include/gpu/gl/GrGLInterface.h +@@ -65,7 +65,9 @@ public: + + GrGLExtensions fExtensions; + ++#ifdef SK_GL + bool hasExtension(const char ext[]) const { return fExtensions.has(ext); } ++#endif + + /** + * The function pointers are in a struct so that we can have a compiler generated assignment +diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h +index 66bfe29331..034cd21838 100644 +--- ./src/gpu/gl/GrGLContext.h ++++ ./src/gpu/gl/GrGLContext.h +@@ -45,10 +45,11 @@ public: + GrGLDriverVersion driverVersion() const { return fDriverVersion; } + const GrGLCaps* caps() const { return fGLCaps.get(); } + GrGLCaps* caps() { return fGLCaps.get(); } ++#ifdef SK_GL + bool hasExtension(const char* ext) const { + return fInterface->hasExtension(ext); + } +- ++#endif + const GrGLExtensions& extensions() const { return fInterface->fExtensions; } + + protected: diff --git a/external/skia/fontconfig-get-typeface.patch.0 b/external/skia/fontconfig-get-typeface.patch.0 new file mode 100644 index 000000000..a7a82bfa0 --- /dev/null +++ b/external/skia/fontconfig-get-typeface.patch.0 @@ -0,0 +1,32 @@ +--- ./src/ports/SkFontMgr_fontconfig.cpp.sav 2020-01-20 16:42:51.322186451 +0100 ++++ ./src/ports/SkFontMgr_fontconfig.cpp 2020-03-13 11:25:15.793936659 +0100 +@@ -699,6 +699,7 @@ class SkFontMgr_fontconfig : public SkFo + /** Creates a typeface using a typeface cache. + * @param pattern a complete pattern from FcFontRenderPrepare. + */ ++public: + sk_sp<SkTypeface> createTypefaceFromFcPattern(FcPattern* pattern) const { + FCLocker::AssertHeld(); + SkAutoMutexExclusive ama(fTFCacheMutex); +@@ -1039,3 +1040,9 @@ protected: + SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc) { + return sk_make_sp<SkFontMgr_fontconfig>(fc); + } ++ ++SK_API sk_sp<SkTypeface> SkFontMgr_createTypefaceFromFcPattern(const sk_sp<SkFontMgr>& mgr, FcPattern* pattern) ++{ ++ FCLocker lock; ++ return static_cast<SkFontMgr_fontconfig*>(mgr.get())->createTypefaceFromFcPattern(pattern); ++} +--- ./include/ports/SkFontMgr_fontconfig.h.sav 2019-09-19 11:38:00.943185323 +0200 ++++ ./include/ports/SkFontMgr_fontconfig.h 2020-03-13 11:31:48.025716543 +0100 +@@ -19,4 +19,9 @@ class SkFontMgr; + */ + SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc); + ++struct _FcPattern; ++typedef struct _FcPattern FcPattern; ++class SkTypeface; ++SK_API sk_sp<SkTypeface> SkFontMgr_createTypefaceFromFcPattern(const sk_sp<SkFontMgr>& mgr, FcPattern* pattern); ++ + #endif // #ifndef SkFontMgr_fontconfig_DEFINED diff --git a/external/skia/inc/pch/precompiled_skia.cxx b/external/skia/inc/pch/precompiled_skia.cxx new file mode 100644 index 000000000..8892e30fd --- /dev/null +++ b/external/skia/inc/pch/precompiled_skia.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "precompiled_skia.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/skia/inc/pch/precompiled_skia.hxx b/external/skia/inc/pch/precompiled_skia.hxx new file mode 100644 index 000000000..a28dd583e --- /dev/null +++ b/external/skia/inc/pch/precompiled_skia.hxx @@ -0,0 +1,960 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2020-06-30 17:38:10 using: + ./bin/update_pch external/skia skia --cutoff=1 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./external/skia/inc/pch/precompiled_skia.hxx "make external/skia.build" --find-conflicts +*/ + +#if PCH_LEVEL >= 1 +#include <algorithm> +#include <assert.h> +#include <atomic> +#include <bitset> +#include <cctype> +#include <cfloat> +#include <chrono> +#include <cinttypes> +#include <climits> +#include <cmath> +#include <cstddef> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctype.h> +#include <deque> +#include <errno.h> +#include <float.h> +#include <functional> +#include <inttypes.h> +#include <iterator> +#include <limits.h> +#include <limits> +#include <locale> +#include <memory> +#include <new> +#include <png.h> +#include <queue> +#include <set> +#include <skcms.h> +#include <sstream> +#include <stdarg.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <string> +#include <thread> +#include <tuple> +#include <type_traits> +#include <unordered_map> +#include <unordered_set> +#include <utility> +#include <vector> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#include <rtl/alloc.h> +#include <sal/log.hxx> +#endif // PCH_LEVEL >= 2 +// PCH_LEVEL >= 3 +#include <include/c/sk_canvas.h> +#include <include/c/sk_colorspace.h> +#include <include/c/sk_data.h> +#include <include/c/sk_image.h> +#include <include/c/sk_imageinfo.h> +#include <include/c/sk_maskfilter.h> +#include <include/c/sk_paint.h> +#include <include/c/sk_path.h> +#include <include/c/sk_picture.h> +#include <include/c/sk_shader.h> +#include <include/c/sk_surface.h> +#include <include/codec/SkAndroidCodec.h> +#include <include/codec/SkCodec.h> +#include <include/core/SkAnnotation.h> +#include <include/core/SkBBHFactory.h> +#include <include/core/SkBitmap.h> +#include <include/core/SkBlendMode.h> +#include <include/core/SkCanvas.h> +#include <include/core/SkColor.h> +#include <include/core/SkColorFilter.h> +#include <include/core/SkColorPriv.h> +#include <include/core/SkColorSpace.h> +#include <include/core/SkContourMeasure.h> +#include <include/core/SkCubicMap.h> +#include <include/core/SkData.h> +#include <include/core/SkDataTable.h> +#include <include/core/SkDeferredDisplayList.h> +#include <include/core/SkDeferredDisplayListRecorder.h> +#include <include/core/SkDocument.h> +#include <include/core/SkDrawLooper.h> +#include <include/core/SkDrawable.h> +#include <include/core/SkExecutor.h> +#include <include/core/SkFilterQuality.h> +#include <include/core/SkFlattenable.h> +#include <include/core/SkFont.h> +#include <include/core/SkFontLCDConfig.h> +#include <include/core/SkFontMetrics.h> +#include <include/core/SkFontMgr.h> +#include <include/core/SkGraphics.h> +#include <include/core/SkICC.h> +#include <include/core/SkImage.h> +#include <include/core/SkImageEncoder.h> +#include <include/core/SkImageFilter.h> +#include <include/core/SkImageGenerator.h> +#include <include/core/SkImageInfo.h> +#include <include/core/SkM44.h> +#include <include/core/SkMallocPixelRef.h> +#include <include/core/SkMaskFilter.h> +#include <include/core/SkMath.h> +#include <include/core/SkMatrix.h> +#include <include/core/SkMatrix44.h> +#include <include/core/SkOverdrawCanvas.h> +#include <include/core/SkPaint.h> +#include <include/core/SkPath.h> +#include <include/core/SkPathBuilder.h> +#include <include/core/SkPathEffect.h> +#include <include/core/SkPathMeasure.h> +#include <include/core/SkPicture.h> +#include <include/core/SkPictureRecorder.h> +#include <include/core/SkPixelRef.h> +#include <include/core/SkPixmap.h> +#include <include/core/SkPoint.h> +#include <include/core/SkPoint3.h> +#include <include/core/SkPromiseImageTexture.h> +#include <include/core/SkRRect.h> +#include <include/core/SkRSXform.h> +#include <include/core/SkRWBuffer.h> +#include <include/core/SkRasterHandleAllocator.h> +#include <include/core/SkRect.h> +#include <include/core/SkRefCnt.h> +#include <include/core/SkRegion.h> +#include <include/core/SkScalar.h> +#include <include/core/SkSerialProcs.h> +#include <include/core/SkShader.h> +#include <include/core/SkSize.h> +#include <include/core/SkStream.h> +#include <include/core/SkString.h> +#include <include/core/SkStrokeRec.h> +#include <include/core/SkSurface.h> +#include <include/core/SkSurfaceCharacterization.h> +#include <include/core/SkSurfaceProps.h> +#include <include/core/SkSwizzle.h> +#include <include/core/SkTextBlob.h> +#include <include/core/SkTileMode.h> +#include <include/core/SkTime.h> +#include <include/core/SkTraceMemoryDump.h> +#include <include/core/SkTypeface.h> +#include <include/core/SkTypes.h> +#include <include/core/SkUnPreMultiply.h> +#include <include/core/SkVertices.h> +#include <include/core/SkYUVAIndex.h> +#include <include/core/SkYUVASizeInfo.h> +#include <include/effects/Sk1DPathEffect.h> +#include <include/effects/Sk2DPathEffect.h> +#include <include/effects/SkAlphaThresholdFilter.h> +#include <include/effects/SkArithmeticImageFilter.h> +#include <include/effects/SkBlurDrawLooper.h> +#include <include/effects/SkBlurImageFilter.h> +#include <include/effects/SkBlurMaskFilter.h> +#include <include/effects/SkColorFilterImageFilter.h> +#include <include/effects/SkColorMatrix.h> +#include <include/effects/SkColorMatrixFilter.h> +#include <include/effects/SkComposeImageFilter.h> +#include <include/effects/SkCornerPathEffect.h> +#include <include/effects/SkDashPathEffect.h> +#include <include/effects/SkDiscretePathEffect.h> +#include <include/effects/SkDisplacementMapEffect.h> +#include <include/effects/SkDropShadowImageFilter.h> +#include <include/effects/SkGradientShader.h> +#include <include/effects/SkHighContrastFilter.h> +#include <include/effects/SkImageFilters.h> +#include <include/effects/SkImageSource.h> +#include <include/effects/SkLayerDrawLooper.h> +#include <include/effects/SkLightingImageFilter.h> +#include <include/effects/SkLumaColorFilter.h> +#include <include/effects/SkMagnifierImageFilter.h> +#include <include/effects/SkMatrixConvolutionImageFilter.h> +#include <include/effects/SkMergeImageFilter.h> +#include <include/effects/SkMorphologyImageFilter.h> +#include <include/effects/SkOffsetImageFilter.h> +#include <include/effects/SkOverdrawColorFilter.h> +#include <include/effects/SkPaintImageFilter.h> +#include <include/effects/SkPerlinNoiseShader.h> +#include <include/effects/SkPictureImageFilter.h> +#include <include/effects/SkRuntimeEffect.h> +#include <include/effects/SkShaderMaskFilter.h> +#include <include/effects/SkStrokeAndFillPathEffect.h> +#include <include/effects/SkTableColorFilter.h> +#include <include/effects/SkTableMaskFilter.h> +#include <include/effects/SkTileImageFilter.h> +#include <include/effects/SkTrimPathEffect.h> +#include <include/effects/SkXfermodeImageFilter.h> +#include <include/encode/SkJpegEncoder.h> +#include <include/encode/SkPngEncoder.h> +#include <include/encode/SkWebpEncoder.h> +#include <include/gpu/GrBackendDrawableInfo.h> +#include <include/gpu/GrBackendSemaphore.h> +#include <include/gpu/GrBackendSurface.h> +#include <include/gpu/GrConfig.h> +#include <include/gpu/GrContext.h> +#include <include/gpu/GrContextOptions.h> +#include <include/gpu/GrContextThreadSafeProxy.h> +#include <include/gpu/GrDriverBugWorkarounds.h> +#include <include/gpu/GrTypes.h> +#include <include/gpu/mock/GrMockTypes.h> +#include <include/gpu/vk/GrVkBackendContext.h> +#include <include/gpu/vk/GrVkExtensions.h> +#include <include/gpu/vk/GrVkMemoryAllocator.h> +#include <include/gpu/vk/GrVkTypes.h> +#include <include/pathops/SkPathOps.h> +#include <include/ports/SkRemotableFontMgr.h> +#include <include/private/GrContext_Base.h> +#include <include/private/GrImageContext.h> +#include <include/private/GrRecordingContext.h> +#include <include/private/GrResourceKey.h> +#include <include/private/GrSingleOwner.h> +#include <include/private/GrTypesPriv.h> +#include <include/private/GrVkTypesPriv.h> +#include <include/private/SkChecksum.h> +#include <include/private/SkColorData.h> +#include <include/private/SkDeque.h> +#include <include/private/SkEncodedInfo.h> +#include <include/private/SkFixed.h> +#include <include/private/SkFloatBits.h> +#include <include/private/SkFloatingPoint.h> +#include <include/private/SkHalf.h> +#include <include/private/SkIDChangeListener.h> +#include <include/private/SkImageInfoPriv.h> +#include <include/private/SkMacros.h> +#include <include/private/SkMalloc.h> +#include <include/private/SkMutex.h> +#include <include/private/SkNx.h> +#include <include/private/SkOnce.h> +#include <include/private/SkPathRef.h> +#include <include/private/SkSafe32.h> +#include <include/private/SkSemaphore.h> +#include <include/private/SkShadowFlags.h> +#include <include/private/SkSpinlock.h> +#include <include/private/SkTArray.h> +#include <include/private/SkTDArray.h> +#include <include/private/SkTFitsIn.h> +#include <include/private/SkTHash.h> +#include <include/private/SkTemplates.h> +#include <include/private/SkThreadAnnotations.h> +#include <include/private/SkThreadID.h> +#include <include/private/SkTo.h> +#include <include/private/SkVx.h> +#include <include/third_party/skcms/skcms.h> +#include <include/utils/SkBase64.h> +#include <include/utils/SkCamera.h> +#include <include/utils/SkCanvasStateUtils.h> +#include <include/utils/SkCustomTypeface.h> +#include <include/utils/SkEventTracer.h> +#include <include/utils/SkInterpolator.h> +#include <include/utils/SkNWayCanvas.h> +#include <include/utils/SkNoDrawCanvas.h> +#include <include/utils/SkNullCanvas.h> +#include <include/utils/SkPaintFilterCanvas.h> +#include <include/utils/SkParse.h> +#include <include/utils/SkParsePath.h> +#include <include/utils/SkRandom.h> +#include <include/utils/SkShadowUtils.h> +#include <include/utils/SkTextUtils.h> +#include <src/codec/SkAndroidCodecAdapter.h> +#include <src/codec/SkBmpBaseCodec.h> +#include <src/codec/SkBmpCodec.h> +#include <src/codec/SkBmpMaskCodec.h> +#include <src/codec/SkBmpRLECodec.h> +#include <src/codec/SkBmpStandardCodec.h> +#include <src/codec/SkCodecImageGenerator.h> +#include <src/codec/SkCodecPriv.h> +#include <src/codec/SkColorTable.h> +#include <src/codec/SkFrameHolder.h> +#include <src/codec/SkIcoCodec.h> +#include <src/codec/SkJpegCodec.h> +#include <src/codec/SkMaskSwizzler.h> +#include <src/codec/SkMasks.h> +#include <src/codec/SkPngCodec.h> +#include <src/codec/SkPngPriv.h> +#include <src/codec/SkRawCodec.h> +#include <src/codec/SkSampledCodec.h> +#include <src/codec/SkSampler.h> +#include <src/codec/SkStreamBuffer.h> +#include <src/codec/SkSwizzler.h> +#include <src/codec/SkWbmpCodec.h> +#include <src/codec/SkWebpCodec.h> +#include <src/core/SkAAClip.h> +#include <src/core/SkATrace.h> +#include <src/core/SkAdvancedTypefaceMetrics.h> +#include <src/core/SkAnalyticEdge.h> +#include <src/core/SkAnnotationKeys.h> +#include <src/core/SkAntiRun.h> +#include <src/core/SkArenaAlloc.h> +#include <src/core/SkAutoBlitterChoose.h> +#include <src/core/SkAutoMalloc.h> +#include <src/core/SkAutoPixmapStorage.h> +#include <src/core/SkBigPicture.h> +#include <src/core/SkBitmapCache.h> +#include <src/core/SkBitmapController.h> +#include <src/core/SkBitmapDevice.h> +#include <src/core/SkBitmapProcState.h> +#include <src/core/SkBlendModePriv.h> +#include <src/core/SkBlitRow.h> +#include <src/core/SkBlitter.h> +#include <src/core/SkBlurMask.h> +#include <src/core/SkBlurPriv.h> +#include <src/core/SkBuffer.h> +#include <src/core/SkCachedData.h> +#include <src/core/SkCanvasPriv.h> +#include <src/core/SkClipOpPriv.h> +#include <src/core/SkClipStack.h> +#include <src/core/SkClipStackDevice.h> +#include <src/core/SkColorFilterBase.h> +#include <src/core/SkColorFilterPriv.h> +#include <src/core/SkColorFilter_Matrix.h> +#include <src/core/SkColorSpacePriv.h> +#include <src/core/SkColorSpaceXformSteps.h> +#include <src/core/SkCompressedDataUtils.h> +#include <src/core/SkConvertPixels.h> +#include <src/core/SkCoreBlitters.h> +#include <src/core/SkCoverageModePriv.h> +#include <src/core/SkCpu.h> +#include <src/core/SkCubicClipper.h> +#include <src/core/SkDeferredDisplayListPriv.h> +#include <src/core/SkDescriptor.h> +#include <src/core/SkDevice.h> +#include <src/core/SkDiscardableMemory.h> +#include <src/core/SkDistanceFieldGen.h> +#include <src/core/SkDraw.h> +#include <src/core/SkDrawProcs.h> +#include <src/core/SkDrawShadowInfo.h> +#include <src/core/SkEdge.h> +#include <src/core/SkEdgeBuilder.h> +#include <src/core/SkEdgeClipper.h> +#include <src/core/SkEffectPriv.h> +#include <src/core/SkEndian.h> +#include <src/core/SkEnumerate.h> +#include <src/core/SkFDot6.h> +#include <src/core/SkFontDescriptor.h> +#include <src/core/SkFontPriv.h> +#include <src/core/SkFontStream.h> +#include <src/core/SkFuzzLogging.h> +#include <src/core/SkGaussFilter.h> +#include <src/core/SkGeometry.h> +#include <src/core/SkGlyph.h> +#include <src/core/SkGlyphBuffer.h> +#include <src/core/SkGlyphRun.h> +#include <src/core/SkGlyphRunPainter.h> +#include <src/core/SkGpuBlurUtils.h> +#include <src/core/SkICCPriv.h> +#include <src/core/SkIPoint16.h> +#include <src/core/SkImageFilterCache.h> +#include <src/core/SkImageFilterTypes.h> +#include <src/core/SkImageFilter_Base.h> +#include <src/core/SkImagePriv.h> +#include <src/core/SkLRUCache.h> +#include <src/core/SkLatticeIter.h> +#include <src/core/SkLeanWindows.h> +#include <src/core/SkLineClipper.h> +#include <src/core/SkLocalMatrixImageFilter.h> +#include <src/core/SkMD5.h> +#include <src/core/SkMSAN.h> +#include <src/core/SkMarkerStack.h> +#include <src/core/SkMask.h> +#include <src/core/SkMaskBlurFilter.h> +#include <src/core/SkMaskCache.h> +#include <src/core/SkMaskFilterBase.h> +#include <src/core/SkMaskGamma.h> +#include <src/core/SkMathPriv.h> +#include <src/core/SkMatrixImageFilter.h> +#include <src/core/SkMatrixPriv.h> +#include <src/core/SkMatrixProvider.h> +#include <src/core/SkMatrixUtils.h> +#include <src/core/SkMessageBus.h> +#include <src/core/SkMiniRecorder.h> +#include <src/core/SkMipMap.h> +#include <src/core/SkModeColorFilter.h> +#include <src/core/SkNextID.h> +#include <src/core/SkOSFile.h> +#include <src/core/SkOpts.h> +#include <src/core/SkPaintDefaults.h> +#include <src/core/SkPaintPriv.h> +#include <src/core/SkPathMakers.h> +#include <src/core/SkPathMeasurePriv.h> +#include <src/core/SkPathPriv.h> +#include <src/core/SkPictureCommon.h> +#include <src/core/SkPictureData.h> +#include <src/core/SkPictureFlat.h> +#include <src/core/SkPicturePlayback.h> +#include <src/core/SkPicturePriv.h> +#include <src/core/SkPictureRecord.h> +#include <src/core/SkPixelRefPriv.h> +#include <src/core/SkPixmapPriv.h> +#include <src/core/SkPointPriv.h> +#include <src/core/SkPtrRecorder.h> +#include <src/core/SkQuadClipper.h> +#include <src/core/SkRRectPriv.h> +#include <src/core/SkRTree.h> +#include <src/core/SkRasterClip.h> +#include <src/core/SkRasterPipeline.h> +#include <src/core/SkReadBuffer.h> +#include <src/core/SkRecord.h> +#include <src/core/SkRecordDraw.h> +#include <src/core/SkRecordOpts.h> +#include <src/core/SkRecordPattern.h> +#include <src/core/SkRecordedDrawable.h> +#include <src/core/SkRecorder.h> +#include <src/core/SkRecords.h> +#include <src/core/SkRectPriv.h> +#include <src/core/SkRegionPriv.h> +#include <src/core/SkRemoteGlyphCache.h> +#include <src/core/SkResourceCache.h> +#include <src/core/SkSafeMath.h> +#include <src/core/SkSafeRange.h> +#include <src/core/SkScaleToSides.h> +#include <src/core/SkScalerCache.h> +#include <src/core/SkScalerContext.h> +#include <src/core/SkScan.h> +#include <src/core/SkScanPriv.h> +#include <src/core/SkScopeExit.h> +#include <src/core/SkSharedMutex.h> +#include <src/core/SkSpan.h> +#include <src/core/SkSpecialImage.h> +#include <src/core/SkSpecialSurface.h> +#include <src/core/SkSpriteBlitter.h> +#include <src/core/SkStreamPriv.h> +#include <src/core/SkStrikeCache.h> +#include <src/core/SkStrikeForGPU.h> +#include <src/core/SkStrikeSpec.h> +#include <src/core/SkStringUtils.h> +#include <src/core/SkStroke.h> +#include <src/core/SkStrokerPriv.h> +#include <src/core/SkSurfacePriv.h> +#include <src/core/SkTDPQueue.h> +#include <src/core/SkTDynamicHash.h> +#include <src/core/SkTInternalLList.h> +#include <src/core/SkTLList.h> +#include <src/core/SkTLazy.h> +#include <src/core/SkTSearch.h> +#include <src/core/SkTSort.h> +#include <src/core/SkTTopoSort.h> +#include <src/core/SkTaskGroup.h> +#include <src/core/SkTextBlobPriv.h> +#include <src/core/SkTextBlobTrace.h> +#include <src/core/SkTextFormatParams.h> +#include <src/core/SkTraceEvent.h> +#include <src/core/SkTraceEventCommon.h> +#include <src/core/SkTypefaceCache.h> +#include <src/core/SkTypeface_remote.h> +#include <src/core/SkUtils.h> +#include <src/core/SkVM.h> +#include <src/core/SkValidationUtils.h> +#include <src/core/SkVertState.h> +#include <src/core/SkVerticesPriv.h> +#include <src/core/SkWriteBuffer.h> +#include <src/core/SkWritePixelsRec.h> +#include <src/core/SkWriter32.h> +#include <src/core/SkXfermodeInterpretation.h> +#include <src/core/SkXfermodePriv.h> +#include <src/core/SkYUVMath.h> +#include <src/core/SkYUVPlanesCache.h> +#include <src/core/SkZip.h> +#include <src/effects/SkDashImpl.h> +#include <src/effects/SkEmbossMask.h> +#include <src/effects/SkEmbossMaskFilter.h> +#include <src/effects/SkOpPE.h> +#include <src/effects/SkPackBits.h> +#include <src/effects/SkTrimPE.h> +#include <src/gpu/GrAHardwareBufferImageGenerator.h> +#include <src/gpu/GrAHardwareBufferUtils.h> +#include <src/gpu/GrAppliedClip.h> +#include <src/gpu/GrAuditTrail.h> +#include <src/gpu/GrAutoLocaleSetter.h> +#include <src/gpu/GrBackendSurfaceMutableStateImpl.h> +#include <src/gpu/GrBackendTextureImageGenerator.h> +#include <src/gpu/GrBackendUtils.h> +#include <src/gpu/GrBaseContextPriv.h> +#include <src/gpu/GrBitmapTextureMaker.h> +#include <src/gpu/GrBlend.h> +#include <src/gpu/GrBlockAllocator.h> +#include <src/gpu/GrBlurUtils.h> +#include <src/gpu/GrBuffer.h> +#include <src/gpu/GrBufferAllocPool.h> +#include <src/gpu/GrCaps.h> +#include <src/gpu/GrClientMappedBufferManager.h> +#include <src/gpu/GrClip.h> +#include <src/gpu/GrClipStackClip.h> +#include <src/gpu/GrColor.h> +#include <src/gpu/GrColorInfo.h> +#include <src/gpu/GrColorSpaceXform.h> +#include <src/gpu/GrContextPriv.h> +#include <src/gpu/GrContextThreadSafeProxyPriv.h> +#include <src/gpu/GrCoordTransform.h> +#include <src/gpu/GrCopyRenderTask.h> +#include <src/gpu/GrCpuBuffer.h> +#include <src/gpu/GrDataUtils.h> +#include <src/gpu/GrDefaultGeoProcFactory.h> +#include <src/gpu/GrDeferredProxyUploader.h> +#include <src/gpu/GrDistanceFieldGenFromVector.h> +#include <src/gpu/GrDrawOpAtlas.h> +#include <src/gpu/GrDrawOpTest.h> +#include <src/gpu/GrDrawingManager.h> +#include <src/gpu/GrDynamicAtlas.h> +#include <src/gpu/GrEagerVertexAllocator.h> +#include <src/gpu/GrFPArgs.h> +#include <src/gpu/GrFinishCallbacks.h> +#include <src/gpu/GrFixedClip.h> +#include <src/gpu/GrFragmentProcessor.h> +#include <src/gpu/GrGeometryProcessor.h> +#include <src/gpu/GrGlyph.h> +#include <src/gpu/GrGpu.h> +#include <src/gpu/GrGpuBuffer.h> +#include <src/gpu/GrGpuResource.h> +#include <src/gpu/GrGpuResourceCacheAccess.h> +#include <src/gpu/GrGpuResourcePriv.h> +#include <src/gpu/GrImageContextPriv.h> +#include <src/gpu/GrImageInfo.h> +#include <src/gpu/GrImageTextureMaker.h> +#include <src/gpu/GrManagedResource.h> +#include <src/gpu/GrMemoryPool.h> +#include <src/gpu/GrNativeRect.h> +#include <src/gpu/GrOnFlushResourceProvider.h> +#include <src/gpu/GrOpFlushState.h> +#include <src/gpu/GrOpsRenderPass.h> +#include <src/gpu/GrOpsTask.h> +#include <src/gpu/GrPaint.h> +#include <src/gpu/GrPath.h> +#include <src/gpu/GrPathProcessor.h> +#include <src/gpu/GrPathRenderer.h> +#include <src/gpu/GrPathRendererChain.h> +#include <src/gpu/GrPathRendering.h> +#include <src/gpu/GrPersistentCacheUtils.h> +#include <src/gpu/GrPipeline.h> +#include <src/gpu/GrPrimitiveProcessor.h> +#include <src/gpu/GrProcessor.h> +#include <src/gpu/GrProcessorAnalysis.h> +#include <src/gpu/GrProcessorSet.h> +#include <src/gpu/GrProcessorUnitTest.h> +#include <src/gpu/GrProgramDesc.h> +#include <src/gpu/GrProgramInfo.h> +#include <src/gpu/GrProxyProvider.h> +#include <src/gpu/GrRecordingContextPriv.h> +#include <src/gpu/GrRectanizerPow2.h> +#include <src/gpu/GrRectanizerSkyline.h> +#include <src/gpu/GrReducedClip.h> +#include <src/gpu/GrRenderTarget.h> +#include <src/gpu/GrRenderTargetContext.h> +#include <src/gpu/GrRenderTargetContextPriv.h> +#include <src/gpu/GrRenderTargetPriv.h> +#include <src/gpu/GrRenderTargetProxy.h> +#include <src/gpu/GrRenderTargetProxyPriv.h> +#include <src/gpu/GrRenderTask.h> +#include <src/gpu/GrResourceAllocator.h> +#include <src/gpu/GrResourceCache.h> +#include <src/gpu/GrResourceProvider.h> +#include <src/gpu/GrResourceProviderPriv.h> +#include <src/gpu/GrRingBuffer.h> +#include <src/gpu/GrSPIRVUniformHandler.h> +#include <src/gpu/GrSPIRVVaryingHandler.h> +#include <src/gpu/GrSWMaskHelper.h> +#include <src/gpu/GrSamplePatternDictionary.h> +#include <src/gpu/GrSamplerState.h> +#include <src/gpu/GrScissorState.h> +#include <src/gpu/GrSemaphore.h> +#include <src/gpu/GrShaderCaps.h> +#include <src/gpu/GrShaderUtils.h> +#include <src/gpu/GrShaderVar.h> +#include <src/gpu/GrSimpleMesh.h> +#include <src/gpu/GrSoftwarePathRenderer.h> +#include <src/gpu/GrStagingBuffer.h> +#include <src/gpu/GrStencilAttachment.h> +#include <src/gpu/GrStencilClip.h> +#include <src/gpu/GrStencilMaskHelper.h> +#include <src/gpu/GrStencilSettings.h> +#include <src/gpu/GrStyle.h> +#include <src/gpu/GrSurface.h> +#include <src/gpu/GrSurfaceContext.h> +#include <src/gpu/GrSurfaceContextPriv.h> +#include <src/gpu/GrSurfacePriv.h> +#include <src/gpu/GrSurfaceProxy.h> +#include <src/gpu/GrSurfaceProxyPriv.h> +#include <src/gpu/GrSurfaceProxyView.h> +#include <src/gpu/GrSwizzle.h> +#include <src/gpu/GrTestUtils.h> +#include <src/gpu/GrTexture.h> +#include <src/gpu/GrTextureAdjuster.h> +#include <src/gpu/GrTextureMaker.h> +#include <src/gpu/GrTexturePriv.h> +#include <src/gpu/GrTextureProducer.h> +#include <src/gpu/GrTextureProxy.h> +#include <src/gpu/GrTextureProxyCacheAccess.h> +#include <src/gpu/GrTextureProxyPriv.h> +#include <src/gpu/GrTextureRenderTargetProxy.h> +#include <src/gpu/GrTextureResolveRenderTask.h> +#include <src/gpu/GrTracing.h> +#include <src/gpu/GrTransferFromRenderTask.h> +#include <src/gpu/GrTriangulator.h> +#include <src/gpu/GrUniformDataManager.h> +#include <src/gpu/GrUserStencilSettings.h> +#include <src/gpu/GrVertexWriter.h> +#include <src/gpu/GrWaitRenderTask.h> +#include <src/gpu/GrWindowRectangles.h> +#include <src/gpu/GrXferProcessor.h> +#include <src/gpu/GrYUVProvider.h> +#include <src/gpu/SkGpuDevice.h> +#include <src/gpu/SkGr.h> +#include <src/gpu/ccpr/GrAutoMapVertexBuffer.h> +#include <src/gpu/ccpr/GrCCAtlas.h> +#include <src/gpu/ccpr/GrCCClipPath.h> +#include <src/gpu/ccpr/GrCCClipProcessor.h> +#include <src/gpu/ccpr/GrCCConicShader.h> +#include <src/gpu/ccpr/GrCCCoverageProcessor.h> +#include <src/gpu/ccpr/GrCCCubicShader.h> +#include <src/gpu/ccpr/GrCCDrawPathsOp.h> +#include <src/gpu/ccpr/GrCCFillGeometry.h> +#include <src/gpu/ccpr/GrCCFiller.h> +#include <src/gpu/ccpr/GrCCPathCache.h> +#include <src/gpu/ccpr/GrCCPathProcessor.h> +#include <src/gpu/ccpr/GrCCPerFlushResources.h> +#include <src/gpu/ccpr/GrCCPerOpsTaskPaths.h> +#include <src/gpu/ccpr/GrCCQuadraticShader.h> +#include <src/gpu/ccpr/GrCCStrokeGeometry.h> +#include <src/gpu/ccpr/GrCCStroker.h> +#include <src/gpu/ccpr/GrCoverageCountingPathRenderer.h> +#include <src/gpu/ccpr/GrGSCoverageProcessor.h> +#include <src/gpu/ccpr/GrOctoBounds.h> +#include <src/gpu/ccpr/GrSampleMaskProcessor.h> +#include <src/gpu/ccpr/GrStencilAtlasOp.h> +#include <src/gpu/ccpr/GrVSCoverageProcessor.h> +#include <src/gpu/effects/GrAtlasedShaderHelpers.h> +#include <src/gpu/effects/GrBezierEffect.h> +#include <src/gpu/effects/GrBicubicEffect.h> +#include <src/gpu/effects/GrBitmapTextGeoProc.h> +#include <src/gpu/effects/GrConvexPolyEffect.h> +#include <src/gpu/effects/GrCoverageSetOpXP.h> +#include <src/gpu/effects/GrCustomXfermode.h> +#include <src/gpu/effects/GrDisableColorXP.h> +#include <src/gpu/effects/GrDistanceFieldGeoProc.h> +#include <src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h> +#include <src/gpu/effects/GrMatrixConvolutionEffect.h> +#include <src/gpu/effects/GrMatrixEffect.h> +#include <src/gpu/effects/GrOvalEffect.h> +#include <src/gpu/effects/GrPorterDuffXferProcessor.h> +#include <src/gpu/effects/GrRRectEffect.h> +#include <src/gpu/effects/GrShadowGeoProc.h> +#include <src/gpu/effects/GrSkSLFP.h> +#include <src/gpu/effects/GrTextureEffect.h> +#include <src/gpu/effects/GrXfermodeFragmentProcessor.h> +#include <src/gpu/effects/GrYUVtoRGBEffect.h> +#include <src/gpu/effects/generated/GrAARectEffect.h> +#include <src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.h> +#include <src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h> +#include <src/gpu/effects/generated/GrCircleBlurFragmentProcessor.h> +#include <src/gpu/effects/generated/GrCircleEffect.h> +#include <src/gpu/effects/generated/GrClampFragmentProcessor.h> +#include <src/gpu/effects/generated/GrColorMatrixFragmentProcessor.h> +#include <src/gpu/effects/generated/GrComposeLerpEffect.h> +#include <src/gpu/effects/generated/GrConfigConversionEffect.h> +#include <src/gpu/effects/generated/GrConstColorProcessor.h> +#include <src/gpu/effects/generated/GrDeviceSpaceEffect.h> +#include <src/gpu/effects/generated/GrEllipseEffect.h> +#include <src/gpu/effects/generated/GrHSLToRGBFilterEffect.h> +#include <src/gpu/effects/generated/GrLumaColorFilterEffect.h> +#include <src/gpu/effects/generated/GrMagnifierEffect.h> +#include <src/gpu/effects/generated/GrMixerEffect.h> +#include <src/gpu/effects/generated/GrOverrideInputFragmentProcessor.h> +#include <src/gpu/effects/generated/GrRGBToHSLFilterEffect.h> +#include <src/gpu/effects/generated/GrRRectBlurEffect.h> +#include <src/gpu/effects/generated/GrRectBlurEffect.h> +#include <src/gpu/geometry/GrPathUtils.h> +#include <src/gpu/geometry/GrQuad.h> +#include <src/gpu/geometry/GrQuadBuffer.h> +#include <src/gpu/geometry/GrQuadUtils.h> +#include <src/gpu/geometry/GrRect.h> +#include <src/gpu/geometry/GrShape.h> +#include <src/gpu/geometry/GrStyledShape.h> +#include <src/gpu/gl/GrGLGpu.h> +#include <src/gpu/gl/GrGLTexture.h> +#include <src/gpu/gl/GrGLUtil.h> +#include <src/gpu/glsl/GrGLSL.h> +#include <src/gpu/glsl/GrGLSLBlend.h> +#include <src/gpu/glsl/GrGLSLColorSpaceXformHelper.h> +#include <src/gpu/glsl/GrGLSLFragmentProcessor.h> +#include <src/gpu/glsl/GrGLSLFragmentShaderBuilder.h> +#include <src/gpu/glsl/GrGLSLGeometryProcessor.h> +#include <src/gpu/glsl/GrGLSLPrimitiveProcessor.h> +#include <src/gpu/glsl/GrGLSLProgramBuilder.h> +#include <src/gpu/glsl/GrGLSLProgramDataManager.h> +#include <src/gpu/glsl/GrGLSLShaderBuilder.h> +#include <src/gpu/glsl/GrGLSLUniformHandler.h> +#include <src/gpu/glsl/GrGLSLVarying.h> +#include <src/gpu/glsl/GrGLSLVertexGeoBuilder.h> +#include <src/gpu/glsl/GrGLSLXferProcessor.h> +#include <src/gpu/gradients/GrGradientBitmapCache.h> +#include <src/gpu/gradients/GrGradientShader.h> +#include <src/gpu/gradients/generated/GrClampedGradientEffect.h> +#include <src/gpu/gradients/generated/GrDualIntervalGradientColorizer.h> +#include <src/gpu/gradients/generated/GrLinearGradientLayout.h> +#include <src/gpu/gradients/generated/GrRadialGradientLayout.h> +#include <src/gpu/gradients/generated/GrSingleIntervalGradientColorizer.h> +#include <src/gpu/gradients/generated/GrSweepGradientLayout.h> +#include <src/gpu/gradients/generated/GrTextureGradientColorizer.h> +#include <src/gpu/gradients/generated/GrTiledGradientEffect.h> +#include <src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.h> +#include <src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer.h> +#include <src/gpu/mock/GrMockBuffer.h> +#include <src/gpu/mock/GrMockCaps.h> +#include <src/gpu/mock/GrMockGpu.h> +#include <src/gpu/mock/GrMockOpsRenderPass.h> +#include <src/gpu/mock/GrMockStencilAttachment.h> +#include <src/gpu/mock/GrMockTexture.h> +#include <src/gpu/ops/GrAAConvexPathRenderer.h> +#include <src/gpu/ops/GrAAConvexTessellator.h> +#include <src/gpu/ops/GrAAHairLinePathRenderer.h> +#include <src/gpu/ops/GrAALinearizingConvexPathRenderer.h> +#include <src/gpu/ops/GrAtlasTextOp.h> +#include <src/gpu/ops/GrClearOp.h> +#include <src/gpu/ops/GrDashLinePathRenderer.h> +#include <src/gpu/ops/GrDashOp.h> +#include <src/gpu/ops/GrDefaultPathRenderer.h> +#include <src/gpu/ops/GrDrawAtlasOp.h> +#include <src/gpu/ops/GrDrawOp.h> +#include <src/gpu/ops/GrDrawPathOp.h> +#include <src/gpu/ops/GrDrawVerticesOp.h> +#include <src/gpu/ops/GrDrawableOp.h> +#include <src/gpu/ops/GrFillRRectOp.h> +#include <src/gpu/ops/GrFillRectOp.h> +#include <src/gpu/ops/GrLatticeOp.h> +#include <src/gpu/ops/GrMeshDrawOp.h> +#include <src/gpu/ops/GrOp.h> +#include <src/gpu/ops/GrOvalOpFactory.h> +#include <src/gpu/ops/GrQuadPerEdgeAA.h> +#include <src/gpu/ops/GrRegionOp.h> +#include <src/gpu/ops/GrShadowRRectOp.h> +#include <src/gpu/ops/GrSimpleMeshDrawOpHelper.h> +#include <src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h> +#include <src/gpu/ops/GrSmallPathRenderer.h> +#include <src/gpu/ops/GrStencilAndCoverPathRenderer.h> +#include <src/gpu/ops/GrStencilPathOp.h> +#include <src/gpu/ops/GrStrokeRectOp.h> +#include <src/gpu/ops/GrTextureOp.h> +#include <src/gpu/ops/GrTriangulatingPathRenderer.h> +#include <src/gpu/tessellate/GrDrawAtlasPathOp.h> +#include <src/gpu/tessellate/GrFillPathShader.h> +#include <src/gpu/tessellate/GrMiddleOutPolygonTriangulator.h> +#include <src/gpu/tessellate/GrMidpointContourParser.h> +#include <src/gpu/tessellate/GrResolveLevelCounter.h> +#include <src/gpu/tessellate/GrStencilPathShader.h> +#include <src/gpu/tessellate/GrStrokeGeometry.h> +#include <src/gpu/tessellate/GrTessellatePathOp.h> +#include <src/gpu/tessellate/GrTessellationPathRenderer.h> +#include <src/gpu/tessellate/GrWangsFormula.h> +#include <src/gpu/text/GrAtlasManager.h> +#include <src/gpu/text/GrDistanceFieldAdjustTable.h> +#include <src/gpu/text/GrSDFMaskFilter.h> +#include <src/gpu/text/GrSDFTOptions.h> +#include <src/gpu/text/GrStrikeCache.h> +#include <src/gpu/text/GrTextBlob.h> +#include <src/gpu/text/GrTextBlobCache.h> +#include <src/gpu/text/GrTextTarget.h> +#include <src/gpu/vk/GrVkBuffer.h> +#include <src/gpu/vk/GrVkCaps.h> +#include <src/gpu/vk/GrVkCommandBuffer.h> +#include <src/gpu/vk/GrVkCommandPool.h> +#include <src/gpu/vk/GrVkDescriptorPool.h> +#include <src/gpu/vk/GrVkDescriptorSet.h> +#include <src/gpu/vk/GrVkDescriptorSetManager.h> +#include <src/gpu/vk/GrVkFramebuffer.h> +#include <src/gpu/vk/GrVkGpu.h> +#include <src/gpu/vk/GrVkImage.h> +#include <src/gpu/vk/GrVkImageLayout.h> +#include <src/gpu/vk/GrVkImageView.h> +#include <src/gpu/vk/GrVkInterface.h> +#include <src/gpu/vk/GrVkMemory.h> +#include <src/gpu/vk/GrVkMeshBuffer.h> +#include <src/gpu/vk/GrVkOpsRenderPass.h> +#include <src/gpu/vk/GrVkPipeline.h> +#include <src/gpu/vk/GrVkPipelineState.h> +#include <src/gpu/vk/GrVkPipelineStateBuilder.h> +#include <src/gpu/vk/GrVkPipelineStateDataManager.h> +#include <src/gpu/vk/GrVkRenderPass.h> +#include <src/gpu/vk/GrVkRenderTarget.h> +#include <src/gpu/vk/GrVkResourceProvider.h> +#include <src/gpu/vk/GrVkSampler.h> +#include <src/gpu/vk/GrVkSamplerYcbcrConversion.h> +#include <src/gpu/vk/GrVkSecondaryCBDrawContext.h> +#include <src/gpu/vk/GrVkSemaphore.h> +#include <src/gpu/vk/GrVkStencilAttachment.h> +#include <src/gpu/vk/GrVkTexture.h> +#include <src/gpu/vk/GrVkTextureRenderTarget.h> +#include <src/gpu/vk/GrVkTransferBuffer.h> +#include <src/gpu/vk/GrVkUniformBuffer.h> +#include <src/gpu/vk/GrVkUniformHandler.h> +#include <src/gpu/vk/GrVkUtil.h> +#include <src/gpu/vk/GrVkVaryingHandler.h> +#include <src/image/SkImage_Base.h> +#include <src/image/SkImage_Gpu.h> +#include <src/image/SkImage_GpuBase.h> +#include <src/image/SkImage_GpuYUVA.h> +#include <src/image/SkImage_Lazy.h> +#include <src/image/SkReadPixelsRec.h> +#include <src/image/SkSurface_Base.h> +#include <src/image/SkSurface_Gpu.h> +#include <src/images/SkImageEncoderPriv.h> +#include <src/lazy/SkDiscardableMemoryPool.h> +#include <src/pathops/SkAddIntersections.h> +#include <src/pathops/SkIntersectionHelper.h> +#include <src/pathops/SkIntersections.h> +#include <src/pathops/SkLineParameters.h> +#include <src/pathops/SkOpAngle.h> +#include <src/pathops/SkOpCoincidence.h> +#include <src/pathops/SkOpContour.h> +#include <src/pathops/SkOpEdgeBuilder.h> +#include <src/pathops/SkOpSegment.h> +#include <src/pathops/SkOpSpan.h> +#include <src/pathops/SkPathOpsBounds.h> +#include <src/pathops/SkPathOpsCommon.h> +#include <src/pathops/SkPathOpsConic.h> +#include <src/pathops/SkPathOpsCubic.h> +#include <src/pathops/SkPathOpsCurve.h> +#include <src/pathops/SkPathOpsDebug.h> +#include <src/pathops/SkPathOpsLine.h> +#include <src/pathops/SkPathOpsPoint.h> +#include <src/pathops/SkPathOpsQuad.h> +#include <src/pathops/SkPathOpsRect.h> +#include <src/pathops/SkPathOpsTSect.h> +#include <src/pathops/SkPathOpsTypes.h> +#include <src/pathops/SkPathWriter.h> +#include <src/pathops/SkReduceOrder.h> +#include <src/ports/SkOSLibrary.h> +#include <src/sfnt/SkOTTableTypes.h> +#include <src/sfnt/SkOTTable_OS_2.h> +#include <src/sfnt/SkOTTable_head.h> +#include <src/sfnt/SkOTTable_name.h> +#include <src/sfnt/SkOTUtils.h> +#include <src/shaders/SkBitmapProcShader.h> +#include <src/shaders/SkColorFilterShader.h> +#include <src/shaders/SkColorShader.h> +#include <src/shaders/SkComposeShader.h> +#include <src/shaders/SkEmptyShader.h> +#include <src/shaders/SkImageShader.h> +#include <src/shaders/SkLocalMatrixShader.h> +#include <src/shaders/SkPictureShader.h> +#include <src/shaders/SkShaderBase.h> +#include <src/shaders/gradients/Sk4fGradientBase.h> +#include <src/shaders/gradients/Sk4fLinearGradient.h> +#include <src/shaders/gradients/SkGradientShaderPriv.h> +#include <src/shaders/gradients/SkLinearGradient.h> +#include <src/shaders/gradients/SkRadialGradient.h> +#include <src/shaders/gradients/SkSweepGradient.h> +#include <src/shaders/gradients/SkTwoPointConicalGradient.h> +#include <src/sksl/GLSL.std.450.h> +#include <src/sksl/SkSLASTNode.h> +#include <src/sksl/SkSLByteCode.h> +#include <src/sksl/SkSLByteCodeGenerator.h> +#include <src/sksl/SkSLCFGGenerator.h> +#include <src/sksl/SkSLCPPCodeGenerator.h> +#include <src/sksl/SkSLCPPUniformCTypes.h> +#include <src/sksl/SkSLCompiler.h> +#include <src/sksl/SkSLContext.h> +#include <src/sksl/SkSLGLSLCodeGenerator.h> +#include <src/sksl/SkSLHCodeGenerator.h> +#include <src/sksl/SkSLIRGenerator.h> +#include <src/sksl/SkSLLexer.h> +#include <src/sksl/SkSLMetalCodeGenerator.h> +#include <src/sksl/SkSLOutputStream.h> +#include <src/sksl/SkSLParser.h> +#include <src/sksl/SkSLPipelineStageCodeGenerator.h> +#include <src/sksl/SkSLSPIRVCodeGenerator.h> +#include <src/sksl/SkSLSPIRVtoHLSL.h> +#include <src/sksl/SkSLSampleMatrix.h> +#include <src/sksl/SkSLSectionAndParameterHelper.h> +#include <src/sksl/SkSLString.h> +#include <src/sksl/SkSLStringStream.h> +#include <src/sksl/SkSLUtil.h> +#include <src/sksl/ir/SkSLBinaryExpression.h> +#include <src/sksl/ir/SkSLBoolLiteral.h> +#include <src/sksl/ir/SkSLBreakStatement.h> +#include <src/sksl/ir/SkSLConstructor.h> +#include <src/sksl/ir/SkSLContinueStatement.h> +#include <src/sksl/ir/SkSLDiscardStatement.h> +#include <src/sksl/ir/SkSLDoStatement.h> +#include <src/sksl/ir/SkSLEnum.h> +#include <src/sksl/ir/SkSLExpression.h> +#include <src/sksl/ir/SkSLExpressionStatement.h> +#include <src/sksl/ir/SkSLExtension.h> +#include <src/sksl/ir/SkSLExternalFunctionCall.h> +#include <src/sksl/ir/SkSLExternalValueReference.h> +#include <src/sksl/ir/SkSLField.h> +#include <src/sksl/ir/SkSLFieldAccess.h> +#include <src/sksl/ir/SkSLFloatLiteral.h> +#include <src/sksl/ir/SkSLForStatement.h> +#include <src/sksl/ir/SkSLFunctionCall.h> +#include <src/sksl/ir/SkSLFunctionDeclaration.h> +#include <src/sksl/ir/SkSLFunctionDefinition.h> +#include <src/sksl/ir/SkSLFunctionReference.h> +#include <src/sksl/ir/SkSLIfStatement.h> +#include <src/sksl/ir/SkSLIndexExpression.h> +#include <src/sksl/ir/SkSLIntLiteral.h> +#include <src/sksl/ir/SkSLInterfaceBlock.h> +#include <src/sksl/ir/SkSLLayout.h> +#include <src/sksl/ir/SkSLModifiers.h> +#include <src/sksl/ir/SkSLModifiersDeclaration.h> +#include <src/sksl/ir/SkSLNop.h> +#include <src/sksl/ir/SkSLNullLiteral.h> +#include <src/sksl/ir/SkSLPostfixExpression.h> +#include <src/sksl/ir/SkSLPrefixExpression.h> +#include <src/sksl/ir/SkSLProgram.h> +#include <src/sksl/ir/SkSLReturnStatement.h> +#include <src/sksl/ir/SkSLSection.h> +#include <src/sksl/ir/SkSLSetting.h> +#include <src/sksl/ir/SkSLSwitchCase.h> +#include <src/sksl/ir/SkSLSwitchStatement.h> +#include <src/sksl/ir/SkSLSwizzle.h> +#include <src/sksl/ir/SkSLSymbolTable.h> +#include <src/sksl/ir/SkSLTernaryExpression.h> +#include <src/sksl/ir/SkSLType.h> +#include <src/sksl/ir/SkSLUnresolvedFunction.h> +#include <src/sksl/ir/SkSLVarDeclarations.h> +#include <src/sksl/ir/SkSLVarDeclarationsStatement.h> +#include <src/sksl/ir/SkSLVariable.h> +#include <src/sksl/ir/SkSLVariableReference.h> +#include <src/sksl/ir/SkSLWhileStatement.h> +#include <src/utils/SkCanvasStack.h> +#include <src/utils/SkCharToGlyphCache.h> +#include <src/utils/SkDashPathPriv.h> +#include <src/utils/SkFloatToDecimal.h> +#include <src/utils/SkJSON.h> +#include <src/utils/SkJSONWriter.h> +#include <src/utils/SkMatrix22.h> +#include <src/utils/SkMultiPictureDocument.h> +#include <src/utils/SkMultiPictureDocumentPriv.h> +#include <src/utils/SkOSPath.h> +#include <src/utils/SkPatchUtils.h> +#include <src/utils/SkPolyUtils.h> +#include <src/utils/SkShadowTessellator.h> +#include <src/utils/SkShaperJSONWriter.h> +#include <src/utils/SkUTF.h> +#include <tools/gpu/vk/GrVulkanDefines.h> +#include <tools/gpu/vk/VkTestUtils.h> +#include <tools/sk_app/VulkanWindowContext.h> +#include <vulkan/vulkan_core.h> +#include <skia_compiler.hxx> +// PCH_LEVEL >= 4 +// PCH_LEVEL >= 5 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/skia/inc/skia_compiler.hxx b/external/skia/inc/skia_compiler.hxx new file mode 100644 index 000000000..a26ec29bd --- /dev/null +++ b/external/skia/inc/skia_compiler.hxx @@ -0,0 +1,13 @@ +/* + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef SKIA_COMPILER_H +#define SKIA_COMPILER_H + +#include <include/core/SkTypes.h> + +SK_API const char* skia_compiler_name(); + +#endif diff --git a/external/skia/lerp.patch b/external/skia/lerp.patch new file mode 100644 index 000000000..2062c21f2 --- /dev/null +++ b/external/skia/lerp.patch @@ -0,0 +1,12 @@ +diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp +index 812dc1694f..60b8d617c6 100644 +--- a/src/shaders/SkPerlinNoiseShader.cpp ++++ b/src/shaders/SkPerlinNoiseShader.cpp +@@ -573,6 +573,7 @@ static SkScalar fade(SkScalar t) { + return t * t * t * (t * (t * 6 - 15) + 10); + } + ++#define lerp skia_lerp + static SkScalar lerp(SkScalar t, SkScalar a, SkScalar b) { + return a + t * (b - a); + } diff --git a/external/skia/libvulkan-name.patch.1 b/external/skia/libvulkan-name.patch.1 new file mode 100644 index 000000000..265d8daa1 --- /dev/null +++ b/external/skia/libvulkan-name.patch.1 @@ -0,0 +1,13 @@ +diff --git a/tools/gpu/vk/VkTestUtils.cpp b/tools/gpu/vk/VkTestUtils.cpp +index 5b7e8c29ae..1580136b5c 100644 +--- a/tools/gpu/vk/VkTestUtils.cpp ++++ b/tools/gpu/vk/VkTestUtils.cpp +@@ -13,7 +13,7 @@ + #if defined _WIN32 + #define SK_GPU_TOOLS_VK_LIBRARY_NAME "vulkan-1.dll" + #else +- #define SK_GPU_TOOLS_VK_LIBRARY_NAME "libvulkan.so" ++ #define SK_GPU_TOOLS_VK_LIBRARY_NAME "libvulkan.so.1" + #endif + #endif + diff --git a/external/skia/make-api-visible.patch.1 b/external/skia/make-api-visible.patch.1 new file mode 100644 index 000000000..bb574b762 --- /dev/null +++ b/external/skia/make-api-visible.patch.1 @@ -0,0 +1,56 @@ +diff --git a/tools/sk_app/unix/WindowContextFactory_unix.h b/tools/sk_app/unix/WindowContextFactory_unix.h +index 11bd2d2ac2..09c92dc417 100644 +--- a/tools/sk_app/unix/WindowContextFactory_unix.h ++++ b/tools/sk_app/unix/WindowContextFactory_unix.h +@@ -36,15 +36,15 @@ struct XlibWindowInfo { + int fHeight; + }; + +-std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo&, const DisplayParams&); ++SK_API std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo&, const DisplayParams&); + +-std::unique_ptr<WindowContext> MakeGLForXlib(const XlibWindowInfo&, const DisplayParams&); ++SK_API std::unique_ptr<WindowContext> MakeGLForXlib(const XlibWindowInfo&, const DisplayParams&); + + #ifdef SK_DAWN +-std::unique_ptr<WindowContext> MakeDawnVulkanForXlib(const XlibWindowInfo&, const DisplayParams&); ++SK_API std::unique_ptr<WindowContext> MakeDawnVulkanForXlib(const XlibWindowInfo&, const DisplayParams&); + #endif + +-std::unique_ptr<WindowContext> MakeRasterForXlib(const XlibWindowInfo&, const DisplayParams&); ++SK_API std::unique_ptr<WindowContext> MakeRasterForXlib(const XlibWindowInfo&, const DisplayParams&); + + } // namespace window_context_factory + +diff --git a/tools/sk_app/win/WindowContextFactory_win.h b/tools/sk_app/win/WindowContextFactory_win.h +index c05a4f0acf..fc27cd2afb 100644 +--- a/tools/sk_app/win/WindowContextFactory_win.h ++++ b/tools/sk_app/win/WindowContextFactory_win.h +@@ -20,21 +20,21 @@ struct DisplayParams; + + namespace window_context_factory { + +-std::unique_ptr<WindowContext> MakeVulkanForWin(HWND, const DisplayParams&); ++SK_API std::unique_ptr<WindowContext> MakeVulkanForWin(HWND, const DisplayParams&); + +-std::unique_ptr<WindowContext> MakeGLForWin(HWND, const DisplayParams&); ++SK_API std::unique_ptr<WindowContext> MakeGLForWin(HWND, const DisplayParams&); + +-std::unique_ptr<WindowContext> MakeANGLEForWin(HWND, const DisplayParams&); ++SK_API std::unique_ptr<WindowContext> MakeANGLEForWin(HWND, const DisplayParams&); + + #ifdef SK_DIRECT3D +-std::unique_ptr<WindowContext> MakeD3D12ForWin(HWND, const DisplayParams&); ++SK_API std::unique_ptr<WindowContext> MakeD3D12ForWin(HWND, const DisplayParams&); + #endif + + #ifdef SK_DAWN +-std::unique_ptr<WindowContext> MakeDawnD3D12ForWin(HWND, const DisplayParams&); ++SK_API std::unique_ptr<WindowContext> MakeDawnD3D12ForWin(HWND, const DisplayParams&); + #endif + +-std::unique_ptr<WindowContext> MakeRasterForWin(HWND, const DisplayParams&); ++SK_API std::unique_ptr<WindowContext> MakeRasterForWin(HWND, const DisplayParams&); + + } // namespace window_context_factory + diff --git a/external/skia/no-trace-resources-on-exit.patch.1 b/external/skia/no-trace-resources-on-exit.patch.1 new file mode 100644 index 000000000..5b8607d55 --- /dev/null +++ b/external/skia/no-trace-resources-on-exit.patch.1 @@ -0,0 +1,26 @@ +diff --git a/src/gpu/vk/GrVkCommandPool.h b/src/gpu/vk/GrVkCommandPool.h +index fd44d62e94..f9e90f185f 100644 +--- a/src/gpu/vk/GrVkCommandPool.h ++++ b/src/gpu/vk/GrVkCommandPool.h +@@ -41,7 +41,7 @@ public: + // returns true if close() has not been called + bool isOpen() const { return fOpen; } + +-#ifdef SK_DEBUG ++#ifdef SK_TRACE_MANAGED_RESOURCES + void dumpInfo() const override { + SkDebugf("GrVkCommandPool: %p (%d refs)\n", fCommandPool, this->getRefCnt()); + } +diff --git a/src/gpu/vk/GrVkResource.h b/src/gpu/vk/GrVkResource.h +index 7b9949ba1b..4e8fb48c7c 100644 +--- a/src/gpu/GrManagedResource.h ++++ b/src/gpu/GrManagedResource.h +@@ -17,7 +17,7 @@ class GrVkGpu; + + // uncomment to enable tracing of resource refs + #ifdef SK_DEBUG +-#define SK_TRACE_MANAGED_RESOURCES ++//#define SK_TRACE_MANAGED_RESOURCES + #endif + + /** \class GrManagedResource diff --git a/external/skia/operator-eq-bool.patch.1 b/external/skia/operator-eq-bool.patch.1 new file mode 100644 index 000000000..d6dc3c139 --- /dev/null +++ b/external/skia/operator-eq-bool.patch.1 @@ -0,0 +1,25 @@ +diff --git a/src/core/SkVM.cpp b/src/core/SkVM.cpp +index 654ab8f97c..e7b3137d8e 100644 +--- a/src/core/SkVM.cpp ++++ b/src/core/SkVM.cpp +@@ -1173,7 +1173,7 @@ namespace skvm { + // Map min channel to 0, max channel to s, and scale the middle proportionally. + auto scale = [&](auto c) { + // TODO: better to divide and check for non-finite result? +- return select(sat == 0.0f, 0.0f ++ return select(eq_op(0.0f, sat), 0.0f + , ((c - mn) * s) / sat); + }; + *r = scale(*r); +diff --git a/src/core/SkVM.h b/src/core/SkVM.h +index db5b273c45..5cf1ebba3c 100644 +--- a/src/core/SkVM.h ++++ b/src/core/SkVM.h +@@ -882,6 +882,7 @@ namespace skvm { + static inline I32 operator==(I32 x, I32 y) { return x->eq(x,y); } + static inline I32 operator==(I32 x, int y) { return x->eq(x,y); } + static inline I32 operator==(int x, I32 y) { return y->eq(x,y); } ++ static inline I32 eq_op(float x, F32 y) { return y->eq(x,y); } + + static inline I32 operator!=(I32 x, I32 y) { return x->neq(x,y); } + static inline I32 operator!=(I32 x, int y) { return x->neq(x,y); } diff --git a/external/skia/public-make-from-backend-texture.patch.1 b/external/skia/public-make-from-backend-texture.patch.1 new file mode 100644 index 000000000..7543ff816 --- /dev/null +++ b/external/skia/public-make-from-backend-texture.patch.1 @@ -0,0 +1,44 @@ +diff --git a/include/core/SkSurface.h b/include/core/SkSurface.h +index bf151c05de..95e84022d4 100644 +--- a/include/core/SkSurface.h ++++ b/include/core/SkSurface.h +@@ -243,7 +243,7 @@ public: + RenderTargetReleaseProc releaseProc = nullptr, + ReleaseContext releaseContext = nullptr); + +-#if GR_TEST_UTILS ++//#if GR_TEST_UTILS + // TODO: Remove this. + static sk_sp<SkSurface> MakeFromBackendTextureAsRenderTarget(GrContext* context, + const GrBackendTexture& backendTexture, +@@ -252,7 +252,7 @@ public: + SkColorType colorType, + sk_sp<SkColorSpace> colorSpace, + const SkSurfaceProps* surfaceProps); +-#endif ++//#endif + + #if defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26 + /** Private. +diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp +index 87c7a81b16..1842487030 100644 +--- a/src/image/SkSurface_Gpu.cpp ++++ b/src/image/SkSurface_Gpu.cpp +@@ -666,7 +666,7 @@ sk_sp<SkSurface> SkSurface::MakeFromBackendRenderTarget(GrContext* context, + return sk_make_sp<SkSurface_Gpu>(std::move(device)); + } + +-#if GR_TEST_UTILS ++//#if GR_TEST_UTILS + sk_sp<SkSurface> SkSurface::MakeFromBackendTextureAsRenderTarget(GrContext* context, + const GrBackendTexture& tex, + GrSurfaceOrigin origin, +@@ -700,7 +700,7 @@ sk_sp<SkSurface> SkSurface::MakeFromBackendTextureAsRenderTarget(GrContext* cont + } + return sk_make_sp<SkSurface_Gpu>(std::move(device)); + } +-#endif ++//#endif + + #if defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26 + sk_sp<SkSurface> SkSurface::MakeFromAHardwareBuffer(GrContext* context, diff --git a/external/skia/share-grcontext.patch.1 b/external/skia/share-grcontext.patch.1 new file mode 100644 index 000000000..1c7da21d6 --- /dev/null +++ b/external/skia/share-grcontext.patch.1 @@ -0,0 +1,591 @@ +diff --git a/tools/sk_app/VulkanWindowContext.cpp b/tools/sk_app/VulkanWindowContext.cpp +index 970c67ec0c..371bd8ab0c 100644 +--- a/tools/sk_app/VulkanWindowContext.cpp ++++ b/tools/sk_app/VulkanWindowContext.cpp +@@ -24,8 +24,10 @@ + #undef CreateSemaphore + #endif + +-#define GET_PROC(F) f ## F = (PFN_vk ## F) fGetInstanceProcAddr(fInstance, "vk" #F) +-#define GET_DEV_PROC(F) f ## F = (PFN_vk ## F) fGetDeviceProcAddr(fDevice, "vk" #F) ++#define GET_PROC(F) f ## F = (PFN_vk ## F) fGetInstanceProcAddr(fShared->fInstance, "vk" #F) ++#define GET_DEV_PROC(F) f ## F = (PFN_vk ## F) fGetDeviceProcAddr(fShared->fDevice, "vk" #F) ++#define GET_PROC_GLOBAL(F) fGlobalShared->f ## F = (PFN_vk ## F) fGetInstanceProcAddr(fGlobalShared->fInstance, "vk" #F) ++#define GET_DEV_PROC_GLOBAL(F) fGlobalShared->f ## F = (PFN_vk ## F) fGetDeviceProcAddr(fGlobalShared->fDevice, "vk" #F) + + namespace sk_app { + +@@ -49,6 +51,14 @@ VulkanWindowContext::VulkanWindowContext(const DisplayParams& params, + } + + void VulkanWindowContext::initializeContext() { ++ fShared = fGlobalShared; ++ if( !fShared ) ++ { ++ // TODO do we need a mutex? ++ ++ fGlobalShared = sk_make_sp<Shared>(); ++ Shared* d = fGlobalShared.get(); // shorter variable name ++ + // any config code here (particularly for msaa)? + + PFN_vkGetInstanceProcAddr getInstanceProc = fGetInstanceProcAddr; +@@ -62,24 +72,25 @@ void VulkanWindowContext::initializeContext() { + }; + GrVkBackendContext backendContext; + GrVkExtensions extensions; +- VkPhysicalDeviceFeatures2 features; +- if (!sk_gpu_test::CreateVkBackendContext(getProc, &backendContext, &extensions, &features, +- &fDebugCallback, &fPresentQueueIndex, fCanPresentFn)) { +- sk_gpu_test::FreeVulkanFeaturesStructs(&features); ++ if (!sk_gpu_test::CreateVkBackendContext(getProc, &backendContext, &extensions, &d->features, ++ &d->fDebugCallback, &d->fPresentQueueIndex, fCanPresentFn)) { ++ sk_gpu_test::FreeVulkanFeaturesStructs(&d->features); ++ fGlobalShared.reset(); + return; + } + + if (!extensions.hasExtension(VK_KHR_SURFACE_EXTENSION_NAME, 25) || + !extensions.hasExtension(VK_KHR_SWAPCHAIN_EXTENSION_NAME, 68)) { +- sk_gpu_test::FreeVulkanFeaturesStructs(&features); ++ sk_gpu_test::FreeVulkanFeaturesStructs(&d->features); ++ fGlobalShared.reset(); + return; + } + +- fInstance = backendContext.fInstance; +- fPhysicalDevice = backendContext.fPhysicalDevice; +- fDevice = backendContext.fDevice; +- fGraphicsQueueIndex = backendContext.fGraphicsQueueIndex; +- fGraphicsQueue = backendContext.fQueue; ++ d->fInstance = backendContext.fInstance; ++ d->fPhysicalDevice = backendContext.fPhysicalDevice; ++ d->fDevice = backendContext.fDevice; ++ d->fGraphicsQueueIndex = backendContext.fGraphicsQueueIndex; ++ d->fGraphicsQueue = backendContext.fQueue; + + PFN_vkGetPhysicalDeviceProperties localGetPhysicalDeviceProperties = + reinterpret_cast<PFN_vkGetPhysicalDeviceProperties>( +@@ -87,21 +98,30 @@ void VulkanWindowContext::initializeContext() { + backendContext.fInstance, + VK_NULL_HANDLE)); + if (!localGetPhysicalDeviceProperties) { +- sk_gpu_test::FreeVulkanFeaturesStructs(&features); ++ sk_gpu_test::FreeVulkanFeaturesStructs(&d->features); ++ fGlobalShared.reset(); + return; + } +- VkPhysicalDeviceProperties physDeviceProperties; +- localGetPhysicalDeviceProperties(backendContext.fPhysicalDevice, &physDeviceProperties); +- uint32_t physDevVersion = physDeviceProperties.apiVersion; ++ localGetPhysicalDeviceProperties(backendContext.fPhysicalDevice, &d->physDeviceProperties); ++ uint32_t physDevVersion = d->physDeviceProperties.apiVersion; + +- fInterface.reset(new GrVkInterface(backendContext.fGetProc, fInstance, fDevice, ++ d->fInterface.reset(new GrVkInterface(backendContext.fGetProc, d->fInstance, d->fDevice, + backendContext.fInstanceVersion, physDevVersion, + &extensions)); + +- GET_PROC(DestroyInstance); +- if (fDebugCallback != VK_NULL_HANDLE) { +- GET_PROC(DestroyDebugReportCallbackEXT); ++ d->fContext = GrContext::MakeVulkan(backendContext, fDisplayParams.fGrContextOptions); ++ ++ GET_PROC_GLOBAL(DestroyInstance); ++ GET_DEV_PROC_GLOBAL(DestroyDevice); ++ if (fGlobalShared->fDebugCallback != VK_NULL_HANDLE) { ++ GET_PROC_GLOBAL(DestroyDebugReportCallbackEXT); + } ++ ++ fShared = fGlobalShared; ++ } // if( !fShared ) ++ ++ fContext = fShared->fContext; ++ + GET_PROC(DestroySurfaceKHR); + GET_PROC(GetPhysicalDeviceSurfaceSupportKHR); + GET_PROC(GetPhysicalDeviceSurfaceCapabilitiesKHR); +@@ -109,7 +129,6 @@ void VulkanWindowContext::initializeContext() { + GET_PROC(GetPhysicalDeviceSurfacePresentModesKHR); + GET_DEV_PROC(DeviceWaitIdle); + GET_DEV_PROC(QueueWaitIdle); +- GET_DEV_PROC(DestroyDevice); + GET_DEV_PROC(CreateSwapchainKHR); + GET_DEV_PROC(DestroySwapchainKHR); + GET_DEV_PROC(GetSwapchainImagesKHR); +@@ -117,46 +136,44 @@ void VulkanWindowContext::initializeContext() { + GET_DEV_PROC(QueuePresentKHR); + GET_DEV_PROC(GetDeviceQueue); + +- fContext = GrContext::MakeVulkan(backendContext, fDisplayParams.fGrContextOptions); ++ // No actual window, used just to create the shared GrContext. ++ if(fCreateVkSurfaceFn == nullptr) ++ return; + +- fSurface = fCreateVkSurfaceFn(fInstance); ++ fSurface = fCreateVkSurfaceFn(fShared->fInstance); + if (VK_NULL_HANDLE == fSurface) { + this->destroyContext(); +- sk_gpu_test::FreeVulkanFeaturesStructs(&features); + return; + } + ++ // create presentQueue ++ fGetDeviceQueue(fShared->fDevice, fShared->fPresentQueueIndex, 0, &fPresentQueue); ++ + VkBool32 supported; +- VkResult res = fGetPhysicalDeviceSurfaceSupportKHR(fPhysicalDevice, fPresentQueueIndex, ++ VkResult res = fGetPhysicalDeviceSurfaceSupportKHR(fShared->fPhysicalDevice, fShared->fPresentQueueIndex, + fSurface, &supported); + if (VK_SUCCESS != res) { + this->destroyContext(); +- sk_gpu_test::FreeVulkanFeaturesStructs(&features); + return; + } + + if (!this->createSwapchain(-1, -1, fDisplayParams)) { + this->destroyContext(); +- sk_gpu_test::FreeVulkanFeaturesStructs(&features); + return; + } +- +- // create presentQueue +- fGetDeviceQueue(fDevice, fPresentQueueIndex, 0, &fPresentQueue); +- sk_gpu_test::FreeVulkanFeaturesStructs(&features); + } + + bool VulkanWindowContext::createSwapchain(int width, int height, + const DisplayParams& params) { + // check for capabilities + VkSurfaceCapabilitiesKHR caps; +- VkResult res = fGetPhysicalDeviceSurfaceCapabilitiesKHR(fPhysicalDevice, fSurface, &caps); ++ VkResult res = fGetPhysicalDeviceSurfaceCapabilitiesKHR(fShared->fPhysicalDevice, fSurface, &caps); + if (VK_SUCCESS != res) { + return false; + } + + uint32_t surfaceFormatCount; +- res = fGetPhysicalDeviceSurfaceFormatsKHR(fPhysicalDevice, fSurface, &surfaceFormatCount, ++ res = fGetPhysicalDeviceSurfaceFormatsKHR(fShared->fPhysicalDevice, fSurface, &surfaceFormatCount, + nullptr); + if (VK_SUCCESS != res) { + return false; +@@ -164,14 +181,14 @@ bool VulkanWindowContext::createSwapchain(int width, int height, + + SkAutoMalloc surfaceFormatAlloc(surfaceFormatCount * sizeof(VkSurfaceFormatKHR)); + VkSurfaceFormatKHR* surfaceFormats = (VkSurfaceFormatKHR*)surfaceFormatAlloc.get(); +- res = fGetPhysicalDeviceSurfaceFormatsKHR(fPhysicalDevice, fSurface, &surfaceFormatCount, ++ res = fGetPhysicalDeviceSurfaceFormatsKHR(fShared->fPhysicalDevice, fSurface, &surfaceFormatCount, + surfaceFormats); + if (VK_SUCCESS != res) { + return false; + } + + uint32_t presentModeCount; +- res = fGetPhysicalDeviceSurfacePresentModesKHR(fPhysicalDevice, fSurface, &presentModeCount, ++ res = fGetPhysicalDeviceSurfacePresentModesKHR(fShared->fPhysicalDevice, fSurface, &presentModeCount, + nullptr); + if (VK_SUCCESS != res) { + return false; +@@ -179,7 +196,7 @@ bool VulkanWindowContext::createSwapchain(int width, int height, + + SkAutoMalloc presentModeAlloc(presentModeCount * sizeof(VkPresentModeKHR)); + VkPresentModeKHR* presentModes = (VkPresentModeKHR*)presentModeAlloc.get(); +- res = fGetPhysicalDeviceSurfacePresentModesKHR(fPhysicalDevice, fSurface, &presentModeCount, ++ res = fGetPhysicalDeviceSurfacePresentModesKHR(fShared->fPhysicalDevice, fSurface, &presentModeCount, + presentModes); + if (VK_SUCCESS != res) { + return false; +@@ -286,8 +303,8 @@ bool VulkanWindowContext::createSwapchain(int width, int height, + swapchainCreateInfo.imageArrayLayers = 1; + swapchainCreateInfo.imageUsage = usageFlags; + +- uint32_t queueFamilies[] = { fGraphicsQueueIndex, fPresentQueueIndex }; +- if (fGraphicsQueueIndex != fPresentQueueIndex) { ++ uint32_t queueFamilies[] = { fShared->fGraphicsQueueIndex, fShared->fPresentQueueIndex }; ++ if (fShared->fGraphicsQueueIndex != fShared->fPresentQueueIndex) { + swapchainCreateInfo.imageSharingMode = VK_SHARING_MODE_CONCURRENT; + swapchainCreateInfo.queueFamilyIndexCount = 2; + swapchainCreateInfo.pQueueFamilyIndices = queueFamilies; +@@ -303,18 +320,18 @@ bool VulkanWindowContext::createSwapchain(int width, int height, + swapchainCreateInfo.clipped = true; + swapchainCreateInfo.oldSwapchain = fSwapchain; + +- res = fCreateSwapchainKHR(fDevice, &swapchainCreateInfo, nullptr, &fSwapchain); ++ res = fCreateSwapchainKHR(fShared->fDevice, &swapchainCreateInfo, nullptr, &fSwapchain); + if (VK_SUCCESS != res) { + return false; + } + + // destroy the old swapchain + if (swapchainCreateInfo.oldSwapchain != VK_NULL_HANDLE) { +- fDeviceWaitIdle(fDevice); ++ fDeviceWaitIdle(fShared->fDevice); + + this->destroyBuffers(); + +- fDestroySwapchainKHR(fDevice, swapchainCreateInfo.oldSwapchain, nullptr); ++ fDestroySwapchainKHR(fShared->fDevice, swapchainCreateInfo.oldSwapchain, nullptr); + } + + this->createBuffers(swapchainCreateInfo.imageFormat, colorType, +@@ -325,10 +342,10 @@ bool VulkanWindowContext::createSwapchain(int width, int height, + + void VulkanWindowContext::createBuffers(VkFormat format, SkColorType colorType, + VkSharingMode sharingMode) { +- fGetSwapchainImagesKHR(fDevice, fSwapchain, &fImageCount, nullptr); ++ fGetSwapchainImagesKHR(fShared->fDevice, fSwapchain, &fImageCount, nullptr); + SkASSERT(fImageCount); + fImages = new VkImage[fImageCount]; +- fGetSwapchainImagesKHR(fDevice, fSwapchain, &fImageCount, fImages); ++ fGetSwapchainImagesKHR(fShared->fDevice, fSwapchain, &fImageCount, fImages); + + // set up initial image layouts and create surfaces + fImageLayouts = new VkImageLayout[fImageCount]; +@@ -343,7 +360,7 @@ void VulkanWindowContext::createBuffers(VkFormat format, SkColorType colorType, + info.fImageTiling = VK_IMAGE_TILING_OPTIMAL; + info.fFormat = format; + info.fLevelCount = 1; +- info.fCurrentQueueFamily = fPresentQueueIndex; ++ info.fCurrentQueueFamily = fShared->fPresentQueueIndex; + info.fSharingMode = sharingMode; + + if (fSampleCount == 1) { +@@ -375,8 +392,8 @@ void VulkanWindowContext::createBuffers(VkFormat format, SkColorType colorType, + fBackbuffers = new BackbufferInfo[fImageCount + 1]; + for (uint32_t i = 0; i < fImageCount + 1; ++i) { + fBackbuffers[i].fImageIndex = -1; +- SkDEBUGCODE(VkResult result = )GR_VK_CALL(fInterface, +- CreateSemaphore(fDevice, &semaphoreInfo, nullptr, ++ SkDEBUGCODE(VkResult result = )GR_VK_CALL(fShared->fInterface, ++ CreateSemaphore(fShared->fDevice, &semaphoreInfo, nullptr, + &fBackbuffers[i].fRenderSemaphore)); + SkASSERT(result == VK_SUCCESS); + } +@@ -388,8 +405,8 @@ void VulkanWindowContext::destroyBuffers() { + if (fBackbuffers) { + for (uint32_t i = 0; i < fImageCount + 1; ++i) { + fBackbuffers[i].fImageIndex = -1; +- GR_VK_CALL(fInterface, +- DestroySemaphore(fDevice, ++ GR_VK_CALL(fShared->fInterface, ++ DestroySemaphore(fShared->fDevice, + fBackbuffers[i].fRenderSemaphore, + nullptr)); + } +@@ -414,41 +431,59 @@ VulkanWindowContext::~VulkanWindowContext() { + void VulkanWindowContext::destroyContext() { + if (this->isValid()) { + fQueueWaitIdle(fPresentQueue); +- fDeviceWaitIdle(fDevice); ++ fDeviceWaitIdle(fShared->fDevice); + + this->destroyBuffers(); + + if (VK_NULL_HANDLE != fSwapchain) { +- fDestroySwapchainKHR(fDevice, fSwapchain, nullptr); ++ fDestroySwapchainKHR(fShared->fDevice, fSwapchain, nullptr); + fSwapchain = VK_NULL_HANDLE; + } + + if (VK_NULL_HANDLE != fSurface) { +- fDestroySurfaceKHR(fInstance, fSurface, nullptr); ++ fDestroySurfaceKHR(fShared->fInstance, fSurface, nullptr); + fSurface = VK_NULL_HANDLE; + } + } + + fContext.reset(); +- fInterface.reset(); ++ fShared.reset(); ++ ++ checkDestroyShared(); ++} ++ ++void VulkanWindowContext::checkDestroyShared() ++{ ++ if(!fGlobalShared || !fGlobalShared->unique()) // TODO mutex? ++ return; ++#ifndef SK_TRACE_VK_RESOURCES ++ if(!fGlobalShared->fContext->unique()) ++ return; ++#endif ++ SkASSERT(fGlobalShared->fContext->unique()); ++ fGlobalShared->fContext.reset(); ++ fGlobalShared->fInterface.reset(); + +- if (VK_NULL_HANDLE != fDevice) { +- fDestroyDevice(fDevice, nullptr); +- fDevice = VK_NULL_HANDLE; ++ if (VK_NULL_HANDLE != fGlobalShared->fDevice) { ++ fGlobalShared->fDestroyDevice(fGlobalShared->fDevice, nullptr); ++ fGlobalShared->fDevice = VK_NULL_HANDLE; + } + + #ifdef SK_ENABLE_VK_LAYERS +- if (fDebugCallback != VK_NULL_HANDLE) { +- fDestroyDebugReportCallbackEXT(fInstance, fDebugCallback, nullptr); ++ if (fGlobalShared->fDebugCallback != VK_NULL_HANDLE) { ++ fGlobalShared->fDestroyDebugReportCallbackEXT(fGlobalShared->fInstance, fDebugCallback, nullptr); + } + #endif + +- fPhysicalDevice = VK_NULL_HANDLE; ++ fGlobalShared->fPhysicalDevice = VK_NULL_HANDLE; + +- if (VK_NULL_HANDLE != fInstance) { +- fDestroyInstance(fInstance, nullptr); +- fInstance = VK_NULL_HANDLE; ++ if (VK_NULL_HANDLE != fGlobalShared->fInstance) { ++ fGlobalShared->fDestroyInstance(fGlobalShared->fInstance, nullptr); ++ fGlobalShared->fInstance = VK_NULL_HANDLE; + } ++ ++ sk_gpu_test::FreeVulkanFeaturesStructs(&fGlobalShared->features); ++ fGlobalShared.reset(); + } + + VulkanWindowContext::BackbufferInfo* VulkanWindowContext::getAvailableBackbuffer() { +@@ -474,35 +509,35 @@ sk_sp<SkSurface> VulkanWindowContext::getBackbufferSurface() { + semaphoreInfo.pNext = nullptr; + semaphoreInfo.flags = 0; + VkSemaphore semaphore; +- SkDEBUGCODE(VkResult result = )GR_VK_CALL(fInterface, CreateSemaphore(fDevice, &semaphoreInfo, ++ SkDEBUGCODE(VkResult result = )GR_VK_CALL(fShared->fInterface, CreateSemaphore(fShared->fDevice, &semaphoreInfo, + nullptr, &semaphore)); + SkASSERT(result == VK_SUCCESS); + + // acquire the image +- VkResult res = fAcquireNextImageKHR(fDevice, fSwapchain, UINT64_MAX, ++ VkResult res = fAcquireNextImageKHR(fShared->fDevice, fSwapchain, UINT64_MAX, + semaphore, VK_NULL_HANDLE, + &backbuffer->fImageIndex); + if (VK_ERROR_SURFACE_LOST_KHR == res) { + // need to figure out how to create a new vkSurface without the platformData* + // maybe use attach somehow? but need a Window +- GR_VK_CALL(fInterface, DestroySemaphore(fDevice, semaphore, nullptr)); ++ GR_VK_CALL(fShared->fInterface, DestroySemaphore(fShared->fDevice, semaphore, nullptr)); + return nullptr; + } + if (VK_ERROR_OUT_OF_DATE_KHR == res) { + // tear swapchain down and try again + if (!this->createSwapchain(-1, -1, fDisplayParams)) { +- GR_VK_CALL(fInterface, DestroySemaphore(fDevice, semaphore, nullptr)); ++ GR_VK_CALL(fShared->fInterface, DestroySemaphore(fShared->fDevice, semaphore, nullptr)); + return nullptr; + } + backbuffer = this->getAvailableBackbuffer(); + + // acquire the image +- res = fAcquireNextImageKHR(fDevice, fSwapchain, UINT64_MAX, ++ res = fAcquireNextImageKHR(fShared->fDevice, fSwapchain, UINT64_MAX, + semaphore, VK_NULL_HANDLE, + &backbuffer->fImageIndex); + + if (VK_SUCCESS != res) { +- GR_VK_CALL(fInterface, DestroySemaphore(fDevice, semaphore, nullptr)); ++ GR_VK_CALL(fShared->fInterface, DestroySemaphore(fShared->fDevice, semaphore, nullptr)); + return nullptr; + } + } +@@ -528,7 +563,7 @@ void VulkanWindowContext::swapBuffers() { + GrFlushInfo info; + info.fNumSemaphores = 1; + info.fSignalSemaphores = &beSemaphore; +- GrBackendSurfaceMutableState presentState(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, fPresentQueueIndex); ++ GrBackendSurfaceMutableState presentState(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, fShared->fPresentQueueIndex); + surface->flush(info, &presentState); + surface->getContext()->submit(); + +@@ -548,4 +583,6 @@ void VulkanWindowContext::swapBuffers() { + fQueuePresentKHR(fPresentQueue, &presentInfo); + } + ++SK_API sk_sp<VulkanWindowContext::Shared> VulkanWindowContext::fGlobalShared; ++ + } //namespace sk_app +diff --git a/tools/sk_app/VulkanWindowContext.h b/tools/sk_app/VulkanWindowContext.h +index 5e245aff70..c6c866372f 100644 +--- a/tools/sk_app/VulkanWindowContext.h ++++ b/tools/sk_app/VulkanWindowContext.h +@@ -19,18 +19,36 @@ + #include "tools/gpu/vk/VkTestUtils.h" + #include "tools/sk_app/WindowContext.h" + ++#include <cassert> ++ + class GrRenderTarget; + + namespace sk_app { + +-class VulkanWindowContext : public WindowContext { ++class SK_API VulkanWindowContext : public WindowContext { ++ struct Shared; + public: + ~VulkanWindowContext() override; + ++ class SharedGrContext { ++ public: ++ SharedGrContext() {} ++ GrContext* getGrContext() { return shared ? shared->fContext.get() : nullptr; } ++ ~SharedGrContext() { shared.reset(); checkDestroyShared(); } ++ bool operator!() const { return !shared; } ++ void reset() { shared.reset(); } ++ private: ++ friend class VulkanWindowContext; ++ SharedGrContext(sk_sp<Shared>& sh ) : shared( sh ) {} ++ sk_sp<Shared> shared; ++ }; ++ ++ static SharedGrContext getSharedGrContext() { return SharedGrContext( fGlobalShared ); } ++ + sk_sp<SkSurface> getBackbufferSurface() override; + void swapBuffers() override; + +- bool isValid() override { return fDevice != VK_NULL_HANDLE; } ++ bool isValid() override { return fSurface != VK_NULL_HANDLE; } + + void resize(int w, int h) override { + this->createSwapchain(w, h, fDisplayParams); +@@ -50,9 +68,15 @@ public: + VulkanWindowContext(const DisplayParams&, CreateVkSurfaceFn, CanPresentFn, + PFN_vkGetInstanceProcAddr, PFN_vkGetDeviceProcAddr); + ++ static const VkPhysicalDeviceProperties& getPhysDeviceProperties() { ++ assert( fGlobalShared != nullptr ); ++ return fGlobalShared->physDeviceProperties; ++ } ++ + private: + void initializeContext(); + void destroyContext(); ++ static void checkDestroyShared(); + + struct BackbufferInfo { + uint32_t fImageIndex; // image this is associated with +@@ -64,11 +88,6 @@ private: + void createBuffers(VkFormat format, SkColorType colorType, VkSharingMode); + void destroyBuffers(); + +- VkInstance fInstance = VK_NULL_HANDLE; +- VkPhysicalDevice fPhysicalDevice = VK_NULL_HANDLE; +- VkDevice fDevice = VK_NULL_HANDLE; +- VkDebugReportCallbackEXT fDebugCallback = VK_NULL_HANDLE; +- + // Create functions + CreateVkSurfaceFn fCreateVkSurfaceFn; + CanPresentFn fCanPresentFn; +@@ -90,20 +109,44 @@ private: + PFN_vkAcquireNextImageKHR fAcquireNextImageKHR = nullptr; + PFN_vkQueuePresentKHR fQueuePresentKHR = nullptr; + +- PFN_vkDestroyInstance fDestroyInstance = nullptr; + PFN_vkDeviceWaitIdle fDeviceWaitIdle = nullptr; +- PFN_vkDestroyDebugReportCallbackEXT fDestroyDebugReportCallbackEXT = nullptr; + PFN_vkQueueWaitIdle fQueueWaitIdle = nullptr; +- PFN_vkDestroyDevice fDestroyDevice = nullptr; + PFN_vkGetDeviceQueue fGetDeviceQueue = nullptr; + ++ // We need to use just one GrContext, so share all the relevant data. ++ struct Shared : public SkRefCnt ++ { ++ PFN_vkDestroyInstance fDestroyInstance = nullptr; ++ PFN_vkDestroyDevice fDestroyDevice = nullptr; ++ PFN_vkDestroyDebugReportCallbackEXT fDestroyDebugReportCallbackEXT = nullptr; ++ ++ VkInstance fInstance = VK_NULL_HANDLE; ++ VkPhysicalDevice fPhysicalDevice = VK_NULL_HANDLE; ++ VkDevice fDevice = VK_NULL_HANDLE; ++ VkDebugReportCallbackEXT fDebugCallback = VK_NULL_HANDLE; ++ + sk_sp<const GrVkInterface> fInterface; + +- VkSurfaceKHR fSurface; +- VkSwapchainKHR fSwapchain; ++ // Original code had this as a function-local variable, but that seems wrong. ++ // It should exist as long as the context exists. ++ VkPhysicalDeviceFeatures2 features; ++ ++ // Store this to make it accessible. ++ VkPhysicalDeviceProperties physDeviceProperties; ++ + uint32_t fGraphicsQueueIndex; + VkQueue fGraphicsQueue; + uint32_t fPresentQueueIndex; ++ ++ sk_sp<GrContext> fContext; ++ }; ++ ++ sk_sp<Shared> fShared; ++ ++ static sk_sp<Shared> fGlobalShared; ++ ++ VkSurfaceKHR fSurface; ++ VkSwapchainKHR fSwapchain; + VkQueue fPresentQueue; + + uint32_t fImageCount; +diff --git a/tools/sk_app/unix/VulkanWindowContext_unix.cpp b/tools/sk_app/unix/VulkanWindowContext_unix.cpp +index 6f0ce0aceb..877578cede 100644 +--- a/tools/sk_app/unix/VulkanWindowContext_unix.cpp ++++ b/tools/sk_app/unix/VulkanWindowContext_unix.cpp +@@ -30,7 +30,7 @@ std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo& info, + return nullptr; + } + +- auto createVkSurface = [&info, instProc](VkInstance instance) -> VkSurfaceKHR { ++ VulkanWindowContext::CreateVkSurfaceFn createVkSurface = [&info, instProc](VkInstance instance) -> VkSurfaceKHR { + static PFN_vkCreateXcbSurfaceKHR createXcbSurfaceKHR = nullptr; + if (!createXcbSurfaceKHR) { + createXcbSurfaceKHR = +@@ -54,6 +54,9 @@ std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo& info, + + return surface; + }; ++ // Allow creating just the shared context, without an associated window. ++ if(info.fWindow == None) ++ createVkSurface = nullptr; + + auto canPresent = [&info, instProc](VkInstance instance, VkPhysicalDevice physDev, + uint32_t queueFamilyIndex) { +@@ -76,7 +79,7 @@ std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo& info, + }; + std::unique_ptr<WindowContext> ctx( + new VulkanWindowContext(displayParams, createVkSurface, canPresent, instProc, devProc)); +- if (!ctx->isValid()) { ++ if (!ctx->isValid() && createVkSurface != nullptr) { + return nullptr; + } + return ctx; +diff --git a/tools/sk_app/win/VulkanWindowContext_win.cpp b/tools/sk_app/win/VulkanWindowContext_win.cpp +index 909c96127b..35e063ae28 100644 +--- a/tools/sk_app/win/VulkanWindowContext_win.cpp ++++ b/tools/sk_app/win/VulkanWindowContext_win.cpp +@@ -30,7 +30,7 @@ std::unique_ptr<WindowContext> MakeVulkanForWin(HWND hwnd, const DisplayParams& + return nullptr; + } + +- auto createVkSurface = [hwnd, instProc] (VkInstance instance) -> VkSurfaceKHR { ++ VulkanWindowContext::CreateVkSurfaceFn createVkSurface = [hwnd, instProc] (VkInstance instance) -> VkSurfaceKHR { + static PFN_vkCreateWin32SurfaceKHR createWin32SurfaceKHR = nullptr; + if (!createWin32SurfaceKHR) { + createWin32SurfaceKHR = (PFN_vkCreateWin32SurfaceKHR) +@@ -54,6 +54,9 @@ std::unique_ptr<WindowContext> MakeVulkanForWin(HWND hwnd, const DisplayParams& + + return surface; + }; ++ // Allow creating just the shared context, without an associated window. ++ if(hwnd == nullptr) ++ createVkSurface = nullptr; + + auto canPresent = [instProc] (VkInstance instance, VkPhysicalDevice physDev, + uint32_t queueFamilyIndex) { +@@ -71,7 +74,7 @@ std::unique_ptr<WindowContext> MakeVulkanForWin(HWND hwnd, const DisplayParams& + + std::unique_ptr<WindowContext> ctx( + new VulkanWindowContext(params, createVkSurface, canPresent, instProc, devProc)); +- if (!ctx->isValid()) { ++ if (!ctx->isValid() && createVkSurface != nullptr) { + return nullptr; + } + return ctx; diff --git a/external/skia/source/SkMemory_malloc.cxx b/external/skia/source/SkMemory_malloc.cxx new file mode 100644 index 000000000..9e2da3c20 --- /dev/null +++ b/external/skia/source/SkMemory_malloc.cxx @@ -0,0 +1,68 @@ +/* + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "include/core/SkTypes.h" +#include "include/private/SkMalloc.h" + +#include <sal/log.hxx> +#include <rtl/alloc.h> + +// Based on SkMemory_malloc.cpp : + +static inline void sk_out_of_memory(size_t size) +{ + SAL_WARN("skia", "sk_out_of_memory (asked for " << size << " bytes)"); + abort(); +} + +static inline void* throw_on_failure(size_t size, void* p) +{ + if (size > 0 && p == nullptr) + { + // If we've got a nullptr here, the only reason we should have failed is running out of RAM. + sk_out_of_memory(size); + } + return p; +} + +void sk_abort_no_print() +{ + SAL_WARN("skia", "sk_abort_no_print"); + abort(); +} + +void sk_out_of_memory(void) +{ + SAL_WARN("skia", "sk_out_of_memory"); + abort(); +} + +void* sk_realloc_throw(void* addr, size_t size) +{ + return throw_on_failure(size, rtl_reallocateMemory(addr, size)); +} + +void sk_free(void* p) { rtl_freeMemory(p); } + +void* sk_malloc_flags(size_t size, unsigned flags) +{ + void* p; + if (flags & SK_MALLOC_ZERO_INITIALIZE) + { + p = rtl_allocateZeroMemory(size); + } + else + { + p = rtl_allocateMemory(size); + } + if (flags & SK_MALLOC_THROW) + { + return throw_on_failure(size, p); + } + else + { + return p; + } +} diff --git a/external/skia/source/skia_compiler.cxx b/external/skia/source/skia_compiler.cxx new file mode 100644 index 000000000..6339a4a4f --- /dev/null +++ b/external/skia/source/skia_compiler.cxx @@ -0,0 +1,20 @@ +/* + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include <skia_compiler.hxx> + +// Get the type of compiler that Skia is compiled with. +const char* skia_compiler_name() +{ +#if defined __clang__ + return "Clang"; +#elif defined __GNUC__ + return "GCC"; +#elif defined _MSC_VER + return "MSVC"; +#else + return "?"; +#endif +} diff --git a/external/skia/windows-do-not-modify-logfont.patch.0 b/external/skia/windows-do-not-modify-logfont.patch.0 new file mode 100644 index 000000000..30c5c1e96 --- /dev/null +++ b/external/skia/windows-do-not-modify-logfont.patch.0 @@ -0,0 +1,29 @@ +--- ./src/ports/SkFontHost_win.cpp ++++ ./src/ports/SkFontHost_win.cpp +@@ -349,7 +349,7 @@ static bool FindByLogFont(SkTypeface* face, void* ctx) { + */ + SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONT& origLF) { + LOGFONT lf = origLF; +- make_canonical(&lf); ++// make_canonical(&lf); + sk_sp<SkTypeface> face = SkTypefaceCache::FindByProcAndRef(FindByLogFont, &lf); + if (!face) { + face = LogFontTypeface::Make(lf); +@@ -363,7 +363,7 @@ SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONT& origLF) { + */ + sk_sp<SkTypeface> SkCreateFontMemResourceTypefaceFromLOGFONT(const LOGFONT& origLF, HANDLE fontMemResource) { + LOGFONT lf = origLF; +- make_canonical(&lf); ++// make_canonical(&lf); + // We'll never get a cache hit, so no point in putting this in SkTypefaceCache. + return FontMemResourceTypeface::Make(lf, fontMemResource); + } +@@ -686,7 +686,7 @@ SkScalerContext_GDI::SkScalerContext_GDI(sk_sp<LogFontTypeface> rawTypeface, + + LOGFONT lf = typeface->fLogFont; + lf.lfHeight = -SkScalarTruncToInt(gdiTextSize); +- lf.lfQuality = compute_quality(fRec); ++// lf.lfQuality = compute_quality(fRec); + fFont = CreateFontIndirect(&lf); + if (!fFont) { + return; diff --git a/external/skia/windows-force-unicode-api.patch.0 b/external/skia/windows-force-unicode-api.patch.0 new file mode 100644 index 000000000..f73de176d --- /dev/null +++ b/external/skia/windows-force-unicode-api.patch.0 @@ -0,0 +1,31 @@ +diff --git a/include/ports/SkTypeface_win.h b/include/ports/SkTypeface_win.h +index f659adf0e9..34446fc7a1 100644 +--- ./include/ports/SkTypeface_win.h ++++ ./include/ports/SkTypeface_win.h +@@ -26,7 +26,7 @@ typedef LOGFONTA LOGFONT; + * corresponding typeface for the specified logfont. The caller is responsible + * for calling unref() when it is finished. + */ +-SK_API SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONT&); ++SK_API SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONTW&); + + /** + * Copy the LOGFONT associated with this typeface into the lf parameter. Note +@@ -34,7 +34,7 @@ SK_API SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONT&); + * not track this (the paint does). + * typeface may be NULL, in which case we return the logfont for the default font. + */ +-SK_API void SkLOGFONTFromTypeface(const SkTypeface* typeface, LOGFONT* lf); ++SK_API void SkLOGFONTFromTypeface(const SkTypeface* typeface, LOGFONTW* lf); + + /** + * Set an optional callback to ensure that the data behind a LOGFONT is loaded. +@@ -42,7 +42,7 @@ SK_API void SkLOGFONTFromTypeface(const SkTypeface* typeface, LOGFONT* lf); + * Normally this is null, and is only required if the font data needs to be + * remotely (re)loaded. + */ +-SK_API void SkTypeface_SetEnsureLOGFONTAccessibleProc(void (*)(const LOGFONT&)); ++SK_API void SkTypeface_SetEnsureLOGFONTAccessibleProc(void (*)(const LOGFONTW&)); + + // Experimental! + // diff --git a/external/skia/windows-raster-surface-no-copies.patch.1 b/external/skia/windows-raster-surface-no-copies.patch.1 new file mode 100644 index 000000000..0c5804d85 --- /dev/null +++ b/external/skia/windows-raster-surface-no-copies.patch.1 @@ -0,0 +1,39 @@ +diff --git a/tools/sk_app/win/RasterWindowContext_win.cpp b/tools/sk_app/win/RasterWindowContext_win.cpp +index 9548220ce6..49f1f9ed17 100644 +--- a/tools/sk_app/win/RasterWindowContext_win.cpp ++++ b/tools/sk_app/win/RasterWindowContext_win.cpp +@@ -55,7 +55,7 @@ void RasterWindowContext_win::resize(int w, int h) { + fWidth = w; + fHeight = h; + fBackbufferSurface.reset(); +- const size_t bmpSize = sizeof(BITMAPINFOHEADER) + w * h * sizeof(uint32_t); ++ const size_t bmpSize = sizeof(BITMAPINFO); + fSurfaceMemory.reset(bmpSize); + BITMAPINFO* bmpInfo = reinterpret_cast<BITMAPINFO*>(fSurfaceMemory.get()); + ZeroMemory(bmpInfo, sizeof(BITMAPINFO)); +@@ -65,11 +65,12 @@ void RasterWindowContext_win::resize(int w, int h) { + bmpInfo->bmiHeader.biPlanes = 1; + bmpInfo->bmiHeader.biBitCount = 32; + bmpInfo->bmiHeader.biCompression = BI_RGB; +- void* pixels = bmpInfo->bmiColors; ++ // Do not use a packed DIB bitmap, SkSurface_Raster::onNewImageSnapshot() does ++ // a deep copy if it does not own the pixels. + + SkImageInfo info = SkImageInfo::Make(w, h, fDisplayParams.fColorType, kPremul_SkAlphaType, + fDisplayParams.fColorSpace); +- fBackbufferSurface = SkSurface::MakeRasterDirect(info, pixels, sizeof(uint32_t) * w); ++ fBackbufferSurface = SkSurface::MakeRaster(info); + } + + sk_sp<SkSurface> RasterWindowContext_win::getBackbufferSurface() { return fBackbufferSurface; } +@@ -77,7 +78,9 @@ sk_sp<SkSurface> RasterWindowContext_win::getBackbufferSurface() { return fBackb + void RasterWindowContext_win::swapBuffers() { + BITMAPINFO* bmpInfo = reinterpret_cast<BITMAPINFO*>(fSurfaceMemory.get()); + HDC dc = GetDC(fWnd); +- StretchDIBits(dc, 0, 0, fWidth, fHeight, 0, 0, fWidth, fHeight, bmpInfo->bmiColors, bmpInfo, ++ SkPixmap pixmap; ++ fBackbufferSurface->peekPixels(&pixmap); ++ StretchDIBits(dc, 0, 0, fWidth, fHeight, 0, 0, fWidth, fHeight, pixmap.addr(), bmpInfo, + DIB_RGB_COLORS, SRCCOPY); + ReleaseDC(fWnd, dc); + } diff --git a/external/skia/windows-text-gamma.patch.0 b/external/skia/windows-text-gamma.patch.0 new file mode 100644 index 000000000..624636b7d --- /dev/null +++ b/external/skia/windows-text-gamma.patch.0 @@ -0,0 +1,70 @@ +--- ./src/ports/SkFontHost_win.cpp.sav 2020-03-18 10:26:52.470184300 +0100 ++++ ./src/ports/SkFontHost_win.cpp 2020-03-18 12:08:04.598406700 +0100 +@@ -1215,17 +1215,23 @@ + // since the caller may require A8 for maskfilters, we can't check for BW + // ... until we have the caller tell us that explicitly + const SkGdiRGB* src = (const SkGdiRGB*)bits; ++#if defined(SK_GAMMA_APPLY_TO_A8) + if (fPreBlend.isApplicable()) { + RGBToA8<true>(src, srcRB, glyph, fPreBlend.fG); +- } else { ++ } else ++#endif ++ { + RGBToA8<false>(src, srcRB, glyph, fPreBlend.fG); + } + } else { // LCD16 + const SkGdiRGB* src = (const SkGdiRGB*)bits; + SkASSERT(SkMask::kLCD16_Format == glyph.fMaskFormat); ++#if defined(SK_GAMMA_APPLY_TO_A8) + if (fPreBlend.isApplicable()) { + RGBToLcd16<true>(src, srcRB, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); +- } else { ++ } else ++#endif ++ { + RGBToLcd16<false>(src, srcRB, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); + } + } +--- ./src/ports/SkScalerContext_win_dw.cpp ++++ ./src/ports/SkScalerContext_win_dw.cpp +@@ -1132,27 +1132,36 @@ void SkScalerContext_DW::generateImage(const SkGlyph& glyph) { + BilevelToBW(src, glyph); + } else if (!isLCD(fRec)) { + if (textureType == DWRITE_TEXTURE_ALIASED_1x1) { ++#if defined(SK_GAMMA_APPLY_TO_A8) + if (fPreBlend.isApplicable()) { + GrayscaleToA8<true>(src, glyph, fPreBlend.fG); +- } else { ++ } else ++#endif ++ { + GrayscaleToA8<false>(src, glyph, fPreBlend.fG); + } + } else { ++#if defined(SK_GAMMA_APPLY_TO_A8) + if (fPreBlend.isApplicable()) { + RGBToA8<true>(src, glyph, fPreBlend.fG); +- } else { ++ } else ++#endif ++ { + RGBToA8<false>(src, glyph, fPreBlend.fG); + } + } + } else { + SkASSERT(SkMask::kLCD16_Format == glyph.fMaskFormat); ++#if defined(SK_GAMMA_APPLY_TO_A8) + if (fPreBlend.isApplicable()) { + if (fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag) { + RGBToLcd16<true, false>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); + } else { + RGBToLcd16<true, true>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); + } +- } else { ++ } else ++#endif ++ { + if (fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag) { + RGBToLcd16<false, false>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); + } else { diff --git a/external/skia/windows-typeface-directwrite.patch.0 b/external/skia/windows-typeface-directwrite.patch.0 new file mode 100644 index 000000000..56e8209ce --- /dev/null +++ b/external/skia/windows-typeface-directwrite.patch.0 @@ -0,0 +1,48 @@ +--- ./include/ports/SkTypeface_win.h ++++ ./include/ports/SkTypeface_win.h +@@ -75,5 +75,13 @@ SK_API sk_sp<SkFontMgr> SkFontMgr_New_DirectWriteRenderer(sk_sp<SkRemotableFontM + */ + SK_API sk_sp<SkRemotableFontMgr> SkRemotableFontMgr_New_DirectWrite(); + ++struct IDWriteFontFace; ++struct IDWriteFont; ++struct IDWriteFontFamily; ++SK_API SkTypeface* SkCreateTypefaceDirectWrite(sk_sp<SkFontMgr> fontMgr, ++ IDWriteFontFace* fontFace, ++ IDWriteFont* font, ++ IDWriteFontFamily* fontFamily); ++ + #endif // SK_BUILD_FOR_WIN + #endif // SkTypeface_win_DEFINED +--- ./src/ports/SkFontMgr_win_dw.cpp ++++ ./src/ports/SkFontMgr_win_dw.cpp +@@ -320,6 +320,10 @@ private: + + friend class SkFontStyleSet_DirectWrite; + friend class FontFallbackRenderer; ++ friend SK_API SkTypeface* SkCreateTypefaceDirectWrite(sk_sp<SkFontMgr> fontMgr, ++ IDWriteFontFace* fontFace, ++ IDWriteFont* font, ++ IDWriteFontFamily* fontFamily); + }; + + class SkFontStyleSet_DirectWrite : public SkFontStyleSet { +@@ -1215,6 +1219,18 @@ SK_API sk_sp<SkFontMgr> SkFontMgr_New_DirectWrite(IDWriteFactory* factory, + defaultFamilyName, defaultFamilyNameLen); + } + ++SkTypeface* SkCreateTypefaceDirectWrite(sk_sp<SkFontMgr> fontMgr, ++ IDWriteFontFace* fontFace, ++ IDWriteFont* font, ++ IDWriteFontFamily* fontFamily) ++{ ++ SkFontMgr_DirectWrite* mgr = dynamic_cast<SkFontMgr_DirectWrite*>(fontMgr.get()); ++ if(!mgr) ++ return nullptr; ++ sk_sp<SkTypeface> typeface = mgr->makeTypefaceFromDWriteFont(fontFace, font, fontFamily); ++ return typeface.release(); ++} ++ + #include "include/ports/SkFontMgr_indirect.h" + SK_API sk_sp<SkFontMgr> SkFontMgr_New_DirectWriteRenderer(sk_sp<SkRemotableFontMgr> proxy) { + sk_sp<SkFontMgr> impl(SkFontMgr_New_DirectWrite()); diff --git a/external/twain_dsm/Module_twain_dsm.mk b/external/twain_dsm/Module_twain_dsm.mk new file mode 100644 index 000000000..bbaedb77b --- /dev/null +++ b/external/twain_dsm/Module_twain_dsm.mk @@ -0,0 +1,20 @@ +# -*- 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,twain_dsm)) + +ifeq ($(OS),WNT) +ifeq ($(BUILD_X86),TRUE) +$(eval $(call gb_Module_add_targets,twain_dsm,\ + UnpackedTarball_twain_dsm \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/twain_dsm/README b/external/twain_dsm/README new file mode 100644 index 000000000..b12e77001 --- /dev/null +++ b/external/twain_dsm/README @@ -0,0 +1 @@ +Windows scanner support.
\ No newline at end of file diff --git a/external/twain_dsm/UnpackedTarball_twain_dsm.mk b/external/twain_dsm/UnpackedTarball_twain_dsm.mk new file mode 100644 index 000000000..11be31e9e --- /dev/null +++ b/external/twain_dsm/UnpackedTarball_twain_dsm.mk @@ -0,0 +1,14 @@ +# -*- 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,twain_dsm)) + +$(eval $(call gb_UnpackedTarball_set_tarball,twain_dsm,$(TWAIN_DSM_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/ucpp/Executable_ucpp.mk b/external/ucpp/Executable_ucpp.mk new file mode 100644 index 000000000..a4be71c49 --- /dev/null +++ b/external/ucpp/Executable_ucpp.mk @@ -0,0 +1,33 @@ +# -*- 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_Executable_Executable,ucpp)) + +$(eval $(call gb_Executable_set_warnings_disabled,ucpp)) + +$(eval $(call gb_Executable_use_unpacked,ucpp,ucpp)) + +$(eval $(call gb_Executable_add_defs,ucpp,\ + -DNO_UCPP_BUF \ + -DUCPP_CONFIG \ + -DSTAND_ALONE \ +)) + +$(eval $(call gb_Executable_add_generated_cobjects,ucpp,\ + UnpackedTarball/ucpp/assert \ + UnpackedTarball/ucpp/cpp \ + UnpackedTarball/ucpp/eval \ + UnpackedTarball/ucpp/hash \ + UnpackedTarball/ucpp/lexer \ + UnpackedTarball/ucpp/macro \ + UnpackedTarball/ucpp/mem \ + UnpackedTarball/ucpp/nhash \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/ucpp/Makefile b/external/ucpp/Makefile new file mode 100644 index 000000000..569ad8a0b --- /dev/null +++ b/external/ucpp/Makefile @@ -0,0 +1,14 @@ +# -*- 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/. +# + +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/ucpp/Module_ucpp.mk b/external/ucpp/Module_ucpp.mk new file mode 100644 index 000000000..dc4c02f53 --- /dev/null +++ b/external/ucpp/Module_ucpp.mk @@ -0,0 +1,20 @@ +# -*- 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,ucpp)) + +# if not cross-compiling or we need ucpp for ODK +ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,ucpp,\ + Executable_ucpp \ + UnpackedTarball_ucpp \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/ucpp/README b/external/ucpp/README new file mode 100644 index 000000000..9246c701a --- /dev/null +++ b/external/ucpp/README @@ -0,0 +1,3 @@ +ucpp is a C99 preprocessor + +Used to be hosted at https://code.google.com/p/ucpp/ - not sure where it's gone diff --git a/external/ucpp/UnpackedTarball_ucpp.mk b/external/ucpp/UnpackedTarball_ucpp.mk new file mode 100644 index 000000000..04d7113b8 --- /dev/null +++ b/external/ucpp/UnpackedTarball_ucpp.mk @@ -0,0 +1,20 @@ +# -*- 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,ucpp)) + +$(eval $(call gb_UnpackedTarball_set_tarball,ucpp,$(UCPP_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,ucpp,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,ucpp,\ + external/ucpp/ucpp.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/ucpp/ucpp.patch b/external/ucpp/ucpp.patch new file mode 100644 index 000000000..c9c4b92b7 --- /dev/null +++ b/external/ucpp/ucpp.patch @@ -0,0 +1,11 @@ +--- cpp.c ++++ cpp.c +@@ -2464,7 +2464,7 @@ + warning(-1, "unknown option '%s'", argv[i]); + } else { + if (filename != 0) { +- error(-1, "spurious filename '%s'", argv[i]); ++ error(-1, "spurious duplicate filename '%s' - vs. '%s' ", argv[i], filename); + return 2; + } + filename = argv[i]; diff --git a/external/unixODBC/README b/external/unixODBC/README new file mode 100644 index 000000000..5f01f07cc --- /dev/null +++ b/external/unixODBC/README @@ -0,0 +1 @@ +Library and API with which to access Data Sources from [http://www.unixodbc.org/] diff --git a/external/unixODBC/inc/odbc/sql.h b/external/unixODBC/inc/odbc/sql.h new file mode 100644 index 000000000..6d1e16083 --- /dev/null +++ b/external/unixODBC/inc/odbc/sql.h @@ -0,0 +1,824 @@ +/************************************************** + * sql.h + * + * These should be consistent with the MS version. + * + **************************************************/ +#ifndef __SQL_H +#define __SQL_H + + +/**************************** + * default to 3.51 declare something else before here and you get a whole new ball of wax + ***************************/ +#ifndef ODBCVER +#define ODBCVER 0x0351 +#endif + +#ifndef __SQLTYPES_H +#include "odbc/sqltypes.h" +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/**************************** + * some ret values + ***************************/ +#define SQL_NULL_DATA (-1) +#define SQL_DATA_AT_EXEC (-2) +#define SQL_SUCCESS 0 +#define SQL_SUCCESS_WITH_INFO 1 +#if (ODBCVER >= 0x0300) +#define SQL_NO_DATA 100 +#endif +#define SQL_ERROR (-1) +#define SQL_INVALID_HANDLE (-2) +#define SQL_STILL_EXECUTING 2 +#define SQL_NEED_DATA 99 +#define SQL_SUCCEEDED(rc) (((rc)&(~1))==0) + +/**************************** + * use these to indicate string termination to some function + ***************************/ +#define SQL_NTS (-3) +#define SQL_NTSL (-3L) + +/* maximum message length */ +#define SQL_MAX_MESSAGE_LENGTH 512 + +/* date/time length constants */ +#if (ODBCVER >= 0x0300) +#define SQL_DATE_LEN 10 +#define SQL_TIME_LEN 8 /* add P+1 if precision is nonzero */ +#define SQL_TIMESTAMP_LEN 19 /* add P+1 if precision is nonzero */ +#endif + +/* handle type identifiers */ +#if (ODBCVER >= 0x0300) +#define SQL_HANDLE_ENV 1 +#define SQL_HANDLE_DBC 2 +#define SQL_HANDLE_STMT 3 +#define SQL_HANDLE_DESC 4 +#endif + +/* environment attribute */ +#if (ODBCVER >= 0x0300) +#define SQL_ATTR_OUTPUT_NTS 10001 +#endif + +/* connection attributes */ +#if (ODBCVER >= 0x0300) +#define SQL_ATTR_AUTO_IPD 10001 +#define SQL_ATTR_METADATA_ID 10014 +#endif /* ODBCVER >= 0x0300 */ + +/* statement attributes */ +#if (ODBCVER >= 0x0300) +#define SQL_ATTR_APP_ROW_DESC 10010 +#define SQL_ATTR_APP_PARAM_DESC 10011 +#define SQL_ATTR_IMP_ROW_DESC 10012 +#define SQL_ATTR_IMP_PARAM_DESC 10013 +#define SQL_ATTR_CURSOR_SCROLLABLE (-1) +#define SQL_ATTR_CURSOR_SENSITIVITY (-2) +#endif + +/* SQL_ATTR_CURSOR_SCROLLABLE values */ +#if (ODBCVER >= 0x0300) +#define SQL_NONSCROLLABLE 0 +#define SQL_SCROLLABLE 1 +#endif /* ODBCVER >= 0x0300 */ + +/* identifiers of fields in the SQL descriptor */ +#if (ODBCVER >= 0x0300) +#define SQL_DESC_COUNT 1001 +#define SQL_DESC_TYPE 1002 +#define SQL_DESC_LENGTH 1003 +#define SQL_DESC_OCTET_LENGTH_PTR 1004 +#define SQL_DESC_PRECISION 1005 +#define SQL_DESC_SCALE 1006 +#define SQL_DESC_DATETIME_INTERVAL_CODE 1007 +#define SQL_DESC_NULLABLE 1008 +#define SQL_DESC_INDICATOR_PTR 1009 +#define SQL_DESC_DATA_PTR 1010 +#define SQL_DESC_NAME 1011 +#define SQL_DESC_UNNAMED 1012 +#define SQL_DESC_OCTET_LENGTH 1013 +#define SQL_DESC_ALLOC_TYPE 1099 +#endif + +/* identifiers of fields in the diagnostics area */ +#if (ODBCVER >= 0x0300) +#define SQL_DIAG_RETURNCODE 1 +#define SQL_DIAG_NUMBER 2 +#define SQL_DIAG_ROW_COUNT 3 +#define SQL_DIAG_SQLSTATE 4 +#define SQL_DIAG_NATIVE 5 +#define SQL_DIAG_MESSAGE_TEXT 6 +#define SQL_DIAG_DYNAMIC_FUNCTION 7 +#define SQL_DIAG_CLASS_ORIGIN 8 +#define SQL_DIAG_SUBCLASS_ORIGIN 9 +#define SQL_DIAG_CONNECTION_NAME 10 +#define SQL_DIAG_SERVER_NAME 11 +#define SQL_DIAG_DYNAMIC_FUNCTION_CODE 12 +#endif + +/* dynamic function codes */ +#if (ODBCVER >= 0x0300) +#define SQL_DIAG_ALTER_DOMAIN 3 +#define SQL_DIAG_ALTER_TABLE 4 +#define SQL_DIAG_CALL 7 +#define SQL_DIAG_CREATE_ASSERTION 6 +#define SQL_DIAG_CREATE_CHARACTER_SET 8 +#define SQL_DIAG_CREATE_COLLATION 10 +#define SQL_DIAG_CREATE_DOMAIN 23 +#define SQL_DIAG_CREATE_INDEX (-1) +#define SQL_DIAG_CREATE_SCHEMA 64 +#define SQL_DIAG_CREATE_TABLE 77 +#define SQL_DIAG_CREATE_TRANSLATION 79 +#define SQL_DIAG_CREATE_VIEW 84 +#define SQL_DIAG_DELETE_WHERE 19 +#define SQL_DIAG_DROP_ASSERTION 24 +#define SQL_DIAG_DROP_CHARACTER_SET 25 +#define SQL_DIAG_DROP_COLLATION 26 +#define SQL_DIAG_DROP_DOMAIN 27 +#define SQL_DIAG_DROP_INDEX (-2) +#define SQL_DIAG_DROP_SCHEMA 31 +#define SQL_DIAG_DROP_TABLE 32 +#define SQL_DIAG_DROP_TRANSLATION 33 +#define SQL_DIAG_DROP_VIEW 36 +#define SQL_DIAG_DYNAMIC_DELETE_CURSOR 38 +#define SQL_DIAG_DYNAMIC_UPDATE_CURSOR 81 +#define SQL_DIAG_GRANT 48 +#define SQL_DIAG_INSERT 50 +#define SQL_DIAG_REVOKE 59 +#define SQL_DIAG_SELECT_CURSOR 85 +#define SQL_DIAG_UNKNOWN_STATEMENT 0 +#define SQL_DIAG_UPDATE_WHERE 82 +#endif /* ODBCVER >= 0x0300 */ + +/* SQL data type codes */ +#define SQL_UNKNOWN_TYPE 0 +#define SQL_CHAR 1 +#define SQL_NUMERIC 2 +#define SQL_DECIMAL 3 +#define SQL_INTEGER 4 +#define SQL_SMALLINT 5 +#define SQL_FLOAT 6 +#define SQL_REAL 7 +#define SQL_DOUBLE 8 +#if (ODBCVER >= 0x0300) +#define SQL_DATETIME 9 +#endif +#define SQL_VARCHAR 12 + +/* One-parameter shortcuts for date/time data types */ +#if (ODBCVER >= 0x0300) +#define SQL_TYPE_DATE 91 +#define SQL_TYPE_TIME 92 +#define SQL_TYPE_TIMESTAMP 93 +#endif + +/* Statement attribute values for cursor sensitivity */ +#if (ODBCVER >= 0x0300) +#define SQL_UNSPECIFIED 0 +#define SQL_INSENSITIVE 1 +#define SQL_SENSITIVE 2 +#endif + +/* GetTypeInfo() request for all data types */ +#define SQL_ALL_TYPES 0 + +/* Default conversion code for SQLBindCol(), SQLBindParam() and SQLGetData() */ +#if (ODBCVER >= 0x0300) +#define SQL_DEFAULT 99 +#endif + +/* SQLGetData() code indicating that the application row descriptor + * specifies the data type + */ +#if (ODBCVER >= 0x0300) +#define SQL_ARD_TYPE (-99) +#endif + +/* SQL date/time type subcodes */ +#if (ODBCVER >= 0x0300) +#define SQL_CODE_DATE 1 +#define SQL_CODE_TIME 2 +#define SQL_CODE_TIMESTAMP 3 +#endif + +/* CLI option values */ +#if (ODBCVER >= 0x0300) +#define SQL_FALSE 0 +#define SQL_TRUE 1 +#endif + +/* values of NULLABLE field in descriptor */ +#define SQL_NO_NULLS 0 +#define SQL_NULLABLE 1 + +/* Value returned by SQLGetTypeInfo() to denote that it is + * not known whether or not a data type supports null values. + */ +#define SQL_NULLABLE_UNKNOWN 2 + +/* Values returned by SQLGetTypeInfo() to show WHERE clause + * supported + */ +#if (ODBCVER >= 0x0300) +#define SQL_PRED_NONE 0 +#define SQL_PRED_CHAR 1 +#define SQL_PRED_BASIC 2 +#endif + +/* values of UNNAMED field in descriptor */ +#if (ODBCVER >= 0x0300) +#define SQL_NAMED 0 +#define SQL_UNNAMED 1 +#endif + +/* values of ALLOC_TYPE field in descriptor */ +#if (ODBCVER >= 0x0300) +#define SQL_DESC_ALLOC_AUTO 1 +#define SQL_DESC_ALLOC_USER 2 +#endif + +/* FreeStmt() options */ +#define SQL_CLOSE 0 +#define SQL_DROP 1 +#define SQL_UNBIND 2 +#define SQL_RESET_PARAMS 3 + +/* Codes used for FetchOrientation in SQLFetchScroll(), + and in SQLDataSources() +*/ +#define SQL_FETCH_NEXT 1 +#define SQL_FETCH_FIRST 2 + +/* Other codes used for FetchOrientation in SQLFetchScroll() */ +#define SQL_FETCH_LAST 3 +#define SQL_FETCH_PRIOR 4 +#define SQL_FETCH_ABSOLUTE 5 +#define SQL_FETCH_RELATIVE 6 + +/* SQLEndTran() options */ +#define SQL_COMMIT 0 +#define SQL_ROLLBACK 1 + +/* null handles returned by SQLAllocHandle() */ +#define SQL_NULL_HENV 0 +#define SQL_NULL_HDBC 0 +#define SQL_NULL_HSTMT 0 +#if (ODBCVER >= 0x0300) +#define SQL_NULL_HDESC 0 +#define SQL_NULL_DESC 0 +#endif + +/* null handle used in place of parent handle when allocating HENV */ +#if (ODBCVER >= 0x0300) +#define SQL_NULL_HANDLE NULL +#endif + +/* Values that may appear in the result set of SQLSpecialColumns() */ +#define SQL_SCOPE_CURROW 0 +#define SQL_SCOPE_TRANSACTION 1 +#define SQL_SCOPE_SESSION 2 + +#define SQL_PC_UNKNOWN 0 +#if (ODBCVER >= 0x0300) +#define SQL_PC_NON_PSEUDO 1 +#endif +#define SQL_PC_PSEUDO 2 + +/* Reserved value for the IdentifierType argument of SQLSpecialColumns() */ +#if (ODBCVER >= 0x0300) +#define SQL_ROW_IDENTIFIER 1 +#endif + +/* Reserved values for UNIQUE argument of SQLStatistics() */ +#define SQL_INDEX_UNIQUE 0 +#define SQL_INDEX_ALL 1 + +/* Values that may appear in the result set of SQLStatistics() */ +#define SQL_INDEX_CLUSTERED 1 +#define SQL_INDEX_HASHED 2 +#define SQL_INDEX_OTHER 3 + +/* SQLGetFunctions() values to identify ODBC APIs */ +#define SQL_API_SQLALLOCCONNECT 1 +#define SQL_API_SQLALLOCENV 2 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLALLOCHANDLE 1001 +#endif +#define SQL_API_SQLALLOCSTMT 3 +#define SQL_API_SQLBINDCOL 4 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLBINDPARAM 1002 +#endif +#define SQL_API_SQLCANCEL 5 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLCLOSECURSOR 1003 +#define SQL_API_SQLCOLATTRIBUTE 6 +#endif +#define SQL_API_SQLCOLUMNS 40 +#define SQL_API_SQLCONNECT 7 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLCOPYDESC 1004 +#endif +#define SQL_API_SQLDATASOURCES 57 +#define SQL_API_SQLDESCRIBECOL 8 +#define SQL_API_SQLDISCONNECT 9 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLENDTRAN 1005 +#endif +#define SQL_API_SQLERROR 10 +#define SQL_API_SQLEXECDIRECT 11 +#define SQL_API_SQLEXECUTE 12 +#define SQL_API_SQLFETCH 13 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLFETCHSCROLL 1021 +#endif +#define SQL_API_SQLFREECONNECT 14 +#define SQL_API_SQLFREEENV 15 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLFREEHANDLE 1006 +#endif +#define SQL_API_SQLFREESTMT 16 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLGETCONNECTATTR 1007 +#endif +#define SQL_API_SQLGETCONNECTOPTION 42 +#define SQL_API_SQLGETCURSORNAME 17 +#define SQL_API_SQLGETDATA 43 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLGETDESCFIELD 1008 +#define SQL_API_SQLGETDESCREC 1009 +#define SQL_API_SQLGETDIAGFIELD 1010 +#define SQL_API_SQLGETDIAGREC 1011 +#define SQL_API_SQLGETENVATTR 1012 +#endif +#define SQL_API_SQLGETFUNCTIONS 44 +#define SQL_API_SQLGETINFO 45 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLGETSTMTATTR 1014 +#endif +#define SQL_API_SQLGETSTMTOPTION 46 +#define SQL_API_SQLGETTYPEINFO 47 +#define SQL_API_SQLNUMRESULTCOLS 18 +#define SQL_API_SQLPARAMDATA 48 +#define SQL_API_SQLPREPARE 19 +#define SQL_API_SQLPUTDATA 49 +#define SQL_API_SQLROWCOUNT 20 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLSETCONNECTATTR 1016 +#endif +#define SQL_API_SQLSETCONNECTOPTION 50 +#define SQL_API_SQLSETCURSORNAME 21 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLSETDESCFIELD 1017 +#define SQL_API_SQLSETDESCREC 1018 +#define SQL_API_SQLSETENVATTR 1019 +#endif +#define SQL_API_SQLSETPARAM 22 +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLSETSTMTATTR 1020 +#endif +#define SQL_API_SQLSETSTMTOPTION 51 +#define SQL_API_SQLSPECIALCOLUMNS 52 +#define SQL_API_SQLSTATISTICS 53 +#define SQL_API_SQLTABLES 54 +#define SQL_API_SQLTRANSACT 23 + +/* Information requested by SQLGetInfo() */ +#if (ODBCVER >= 0x0300) +#define SQL_MAX_DRIVER_CONNECTIONS 0 +#define SQL_MAXIMUM_DRIVER_CONNECTIONS SQL_MAX_DRIVER_CONNECTIONS +#define SQL_MAX_CONCURRENT_ACTIVITIES 1 +#define SQL_MAXIMUM_CONCURRENT_ACTIVITIES SQL_MAX_CONCURRENT_ACTIVITIES +#endif +#define SQL_DATA_SOURCE_NAME 2 +#define SQL_FETCH_DIRECTION 8 +#define SQL_SERVER_NAME 13 +#define SQL_SEARCH_PATTERN_ESCAPE 14 +#define SQL_DBMS_NAME 17 +#define SQL_DBMS_VER 18 +#define SQL_ACCESSIBLE_TABLES 19 +#define SQL_ACCESSIBLE_PROCEDURES 20 +#define SQL_CURSOR_COMMIT_BEHAVIOR 23 +#define SQL_DATA_SOURCE_READ_ONLY 25 +#define SQL_DEFAULT_TXN_ISOLATION 26 +#define SQL_IDENTIFIER_CASE 28 +#define SQL_IDENTIFIER_QUOTE_CHAR 29 +#define SQL_MAX_COLUMN_NAME_LEN 30 +#define SQL_MAXIMUM_COLUMN_NAME_LENGTH SQL_MAX_COLUMN_NAME_LEN +#define SQL_MAX_CURSOR_NAME_LEN 31 +#define SQL_MAXIMUM_CURSOR_NAME_LENGTH SQL_MAX_CURSOR_NAME_LEN +#define SQL_MAX_SCHEMA_NAME_LEN 32 +#define SQL_MAXIMUM_SCHEMA_NAME_LENGTH SQL_MAX_SCHEMA_NAME_LEN +#define SQL_MAX_CATALOG_NAME_LEN 34 +#define SQL_MAXIMUM_CATALOG_NAME_LENGTH SQL_MAX_CATALOG_NAME_LEN +#define SQL_MAX_TABLE_NAME_LEN 35 +#define SQL_SCROLL_CONCURRENCY 43 +#define SQL_TXN_CAPABLE 46 +#define SQL_TRANSACTION_CAPABLE SQL_TXN_CAPABLE +#define SQL_USER_NAME 47 +#define SQL_TXN_ISOLATION_OPTION 72 +#define SQL_TRANSACTION_ISOLATION_OPTION SQL_TXN_ISOLATION_OPTION +#define SQL_INTEGRITY 73 +#define SQL_GETDATA_EXTENSIONS 81 +#define SQL_NULL_COLLATION 85 +#define SQL_ALTER_TABLE 86 +#define SQL_ORDER_BY_COLUMNS_IN_SELECT 90 +#define SQL_SPECIAL_CHARACTERS 94 +#define SQL_MAX_COLUMNS_IN_GROUP_BY 97 +#define SQL_MAXIMUM_COLUMNS_IN_GROUP_BY SQL_MAX_COLUMNS_IN_GROUP_BY +#define SQL_MAX_COLUMNS_IN_INDEX 98 +#define SQL_MAXIMUM_COLUMNS_IN_INDEX SQL_MAX_COLUMNS_IN_INDEX +#define SQL_MAX_COLUMNS_IN_ORDER_BY 99 +#define SQL_MAXIMUM_COLUMNS_IN_ORDER_BY SQL_MAX_COLUMNS_IN_ORDER_BY +#define SQL_MAX_COLUMNS_IN_SELECT 100 +#define SQL_MAXIMUM_COLUMNS_IN_SELECT SQL_MAX_COLUMNS_IN_SELECT +#define SQL_MAX_COLUMNS_IN_TABLE 101 +#define SQL_MAX_INDEX_SIZE 102 +#define SQL_MAXIMUM_INDEX_SIZE SQL_MAX_INDEX_SIZE +#define SQL_MAX_ROW_SIZE 104 +#define SQL_MAXIMUM_ROW_SIZE SQL_MAX_ROW_SIZE +#define SQL_MAX_STATEMENT_LEN 105 +#define SQL_MAXIMUM_STATEMENT_LENGTH SQL_MAX_STATEMENT_LEN +#define SQL_MAX_TABLES_IN_SELECT 106 +#define SQL_MAXIMUM_TABLES_IN_SELECT SQL_MAX_TABLES_IN_SELECT +#define SQL_MAX_USER_NAME_LEN 107 +#define SQL_MAXIMUM_USER_NAME_LENGTH SQL_MAX_USER_NAME_LEN +#if (ODBCVER >= 0x0300) +#define SQL_OJ_CAPABILITIES 115 +#define SQL_OUTER_JOIN_CAPABILITIES SQL_OJ_CAPABILITIES +#endif /* ODBCVER >= 0x0300 */ + +#if (ODBCVER >= 0x0300) +#define SQL_XOPEN_CLI_YEAR 10000 +#define SQL_CURSOR_SENSITIVITY 10001 +#define SQL_DESCRIBE_PARAMETER 10002 +#define SQL_CATALOG_NAME 10003 +#define SQL_COLLATION_SEQ 10004 +#define SQL_MAX_IDENTIFIER_LEN 10005 +#define SQL_MAXIMUM_IDENTIFIER_LENGTH SQL_MAX_IDENTIFIER_LEN +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_ALTER_TABLE bitmasks */ +#if (ODBCVER >= 0x0200) +#define SQL_AT_ADD_COLUMN 0x00000001L +#define SQL_AT_DROP_COLUMN 0x00000002L +#endif /* ODBCVER >= 0x0200 */ + +#if (ODBCVER >= 0x0300) +#define SQL_AT_ADD_CONSTRAINT 0x00000008L + +/* The following bitmasks are ODBC extensions and defined in sqlext.h +*#define SQL_AT_COLUMN_SINGLE 0x00000020L +*#define SQL_AT_ADD_COLUMN_DEFAULT 0x00000040L +*#define SQL_AT_ADD_COLUMN_COLLATION 0x00000080L +*#define SQL_AT_SET_COLUMN_DEFAULT 0x00000100L +*#define SQL_AT_DROP_COLUMN_DEFAULT 0x00000200L +*#define SQL_AT_DROP_COLUMN_CASCADE 0x00000400L +*#define SQL_AT_DROP_COLUMN_RESTRICT 0x00000800L +*#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L +*#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L +*#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L +*#define SQL_AT_CONSTRAINT_NAME_DEFINITION 0x00008000L +*#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED 0x00010000L +*#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00020000L +*#define SQL_AT_CONSTRAINT_DEFERRABLE 0x00040000L +*#define SQL_AT_CONSTRAINT_NON_DEFERRABLE 0x00080000L +*/ +#endif /* ODBCVER >= 0x0300 */ + + +/* SQL_ASYNC_MODE values */ +#if (ODBCVER >= 0x0300) +#define SQL_AM_NONE 0 +#define SQL_AM_CONNECTION 1 +#define SQL_AM_STATEMENT 2 +#endif + +/* SQL_CURSOR_COMMIT_BEHAVIOR values */ +#define SQL_CB_DELETE 0 +#define SQL_CB_CLOSE 1 +#define SQL_CB_PRESERVE 2 + +/* SQL_FETCH_DIRECTION bitmasks */ +#define SQL_FD_FETCH_NEXT 0x00000001L +#define SQL_FD_FETCH_FIRST 0x00000002L +#define SQL_FD_FETCH_LAST 0x00000004L +#define SQL_FD_FETCH_PRIOR 0x00000008L +#define SQL_FD_FETCH_ABSOLUTE 0x00000010L +#define SQL_FD_FETCH_RELATIVE 0x00000020L + +/* SQL_GETDATA_EXTENSIONS bitmasks */ +#define SQL_GD_ANY_COLUMN 0x00000001L +#define SQL_GD_ANY_ORDER 0x00000002L + +/* SQL_IDENTIFIER_CASE values */ +#define SQL_IC_UPPER 1 +#define SQL_IC_LOWER 2 +#define SQL_IC_SENSITIVE 3 +#define SQL_IC_MIXED 4 + +/* SQL_OJ_CAPABILITIES bitmasks */ +/* NB: this means 'outer join', not what you may be thinking */ + + +#if (ODBCVER >= 0x0201) +#define SQL_OJ_LEFT 0x00000001L +#define SQL_OJ_RIGHT 0x00000002L +#define SQL_OJ_FULL 0x00000004L +#define SQL_OJ_NESTED 0x00000008L +#define SQL_OJ_NOT_ORDERED 0x00000010L +#define SQL_OJ_INNER 0x00000020L +#define SQL_OJ_ALL_COMPARISON_OPS 0x00000040L +#endif + +/* SQL_SCROLL_CONCURRENCY bitmasks */ +#define SQL_SCCO_READ_ONLY 0x00000001L +#define SQL_SCCO_LOCK 0x00000002L +#define SQL_SCCO_OPT_ROWVER 0x00000004L +#define SQL_SCCO_OPT_VALUES 0x00000008L + +/* SQL_TXN_CAPABLE values */ +#define SQL_TC_NONE 0 +#define SQL_TC_DML 1 +#define SQL_TC_ALL 2 +#define SQL_TC_DDL_COMMIT 3 +#define SQL_TC_DDL_IGNORE 4 + +/* SQL_TXN_ISOLATION_OPTION bitmasks */ +#define SQL_TXN_READ_UNCOMMITTED 0x00000001L +#define SQL_TRANSACTION_READ_UNCOMMITTED SQL_TXN_READ_UNCOMMITTED +#define SQL_TXN_READ_COMMITTED 0x00000002L +#define SQL_TRANSACTION_READ_COMMITTED SQL_TXN_READ_COMMITTED +#define SQL_TXN_REPEATABLE_READ 0x00000004L +#define SQL_TRANSACTION_REPEATABLE_READ SQL_TXN_REPEATABLE_READ +#define SQL_TXN_SERIALIZABLE 0x00000008L +#define SQL_TRANSACTION_SERIALIZABLE SQL_TXN_SERIALIZABLE + +/* SQL_NULL_COLLATION values */ +#define SQL_NC_HIGH 0 +#define SQL_NC_LOW 1 + + SQLRETURN SQL_API SQLAllocConnect(SQLHENV EnvironmentHandle, + SQLHDBC *ConnectionHandle); + + SQLRETURN SQL_API SQLAllocEnv(SQLHENV *EnvironmentHandle); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLAllocHandle(SQLSMALLINT HandleType, + SQLHANDLE InputHandle, SQLHANDLE *OutputHandle); +#endif + + SQLRETURN SQL_API SQLAllocStmt(SQLHDBC ConnectionHandle, + SQLHSTMT *StatementHandle); + + SQLRETURN SQL_API SQLBindCol(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, + SQLPOINTER TargetValue, SQLLEN BufferLength, + SQLLEN *StrLen_or_Ind); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLBindParam(SQLHSTMT StatementHandle, + SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, + SQLSMALLINT ParameterType, SQLULEN LengthPrecision, + SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, + SQLLEN *StrLen_or_Ind); +#endif + + SQLRETURN SQL_API SQLCancel(SQLHSTMT StatementHandle); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT StatementHandle); + + SQLRETURN SQL_API SQLColAttribute(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier, + SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength, SQLLEN *NumericAttribute + /* spec says (SQLPOINTER) not (SQLEN*) - PAH */ ); + /* Ms now say SQLLEN* http://msdn.microsoft.com/library/en-us/odbc/htm/dasdkodbcoverview_64bit.asp - NG */ + +#endif + + + SQLRETURN SQL_API SQLColumns(SQLHSTMT StatementHandle, + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, + SQLCHAR *ColumnName, SQLSMALLINT NameLength4); + + + SQLRETURN SQL_API SQLConnect(SQLHDBC ConnectionHandle, + SQLCHAR *ServerName, SQLSMALLINT NameLength1, + SQLCHAR *UserName, SQLSMALLINT NameLength2, + SQLCHAR *Authentication, SQLSMALLINT NameLength3); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLCopyDesc(SQLHDESC SourceDescHandle, + SQLHDESC TargetDescHandle); +#endif + + SQLRETURN SQL_API SQLDataSources(SQLHENV EnvironmentHandle, + SQLUSMALLINT Direction, SQLCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, + SQLCHAR *Description, SQLSMALLINT BufferLength2, + SQLSMALLINT *NameLength2); + + SQLRETURN SQL_API SQLDescribeCol(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, + SQLSMALLINT *DataType, SQLULEN *ColumnSize, + SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable); + + SQLRETURN SQL_API SQLDisconnect(SQLHDBC ConnectionHandle); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle, + SQLSMALLINT CompletionType); +#endif + + SQLRETURN SQL_API SQLError(SQLHENV EnvironmentHandle, + SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle, + SQLCHAR *Sqlstate, SQLINTEGER *NativeError, + SQLCHAR *MessageText, SQLSMALLINT BufferLength, + SQLSMALLINT *TextLength); + + SQLRETURN SQL_API SQLExecDirect(SQLHSTMT StatementHandle, + SQLCHAR *StatementText, SQLINTEGER TextLength); + + SQLRETURN SQL_API SQLExecute(SQLHSTMT StatementHandle); + + SQLRETURN SQL_API SQLFetch(SQLHSTMT StatementHandle); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLFetchScroll(SQLHSTMT StatementHandle, + SQLSMALLINT FetchOrientation, SQLLEN FetchOffset); +#endif + + SQLRETURN SQL_API SQLFreeConnect(SQLHDBC ConnectionHandle); + + SQLRETURN SQL_API SQLFreeEnv(SQLHENV EnvironmentHandle); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle); +#endif + + SQLRETURN SQL_API SQLFreeStmt(SQLHSTMT StatementHandle, + SQLUSMALLINT Option); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLGetConnectAttr(SQLHDBC ConnectionHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength); +#endif + + SQLRETURN SQL_API SQLGetConnectOption(SQLHDBC ConnectionHandle, + SQLUSMALLINT Option, SQLPOINTER Value); + + SQLRETURN SQL_API SQLGetCursorName(SQLHSTMT StatementHandle, + SQLCHAR *CursorName, SQLSMALLINT BufferLength, + SQLSMALLINT *NameLength); + + SQLRETURN SQL_API SQLGetData(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, + SQLPOINTER TargetValue, SQLLEN BufferLength, + SQLLEN *StrLen_or_Ind); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQLGetDescField(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, SQLINTEGER BufferLength, + SQLINTEGER *StringLength); + + SQLRETURN SQL_API SQLGetDescRec(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, SQLCHAR *Name, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, + SQLSMALLINT *Type, SQLSMALLINT *SubType, + SQLLEN *Length, SQLSMALLINT *Precision, + SQLSMALLINT *Scale, SQLSMALLINT *Nullable); + + SQLRETURN SQL_API SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle, + SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier, + SQLPOINTER DiagInfo, SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength); + + SQLRETURN SQL_API SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle, + SQLSMALLINT RecNumber, SQLCHAR *Sqlstate, + SQLINTEGER *NativeError, SQLCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength); + + SQLRETURN SQL_API SQLGetEnvAttr(SQLHENV EnvironmentHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength); +#endif /* ODBCVER >= 0x0300 */ + + SQLRETURN SQL_API SQLGetFunctions(SQLHDBC ConnectionHandle, + SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported); + + SQLRETURN SQL_API SQLGetInfo(SQLHDBC ConnectionHandle, + SQLUSMALLINT InfoType, SQLPOINTER InfoValue, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLGetStmtAttr(SQLHSTMT StatementHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength); +#endif /* ODBCVER >= 0x0300 */ + + SQLRETURN SQL_API SQLGetStmtOption(SQLHSTMT StatementHandle, + SQLUSMALLINT Option, SQLPOINTER Value); + + SQLRETURN SQL_API SQLGetTypeInfo(SQLHSTMT StatementHandle, + SQLSMALLINT DataType); + + SQLRETURN SQL_API SQLNumResultCols(SQLHSTMT StatementHandle, + SQLSMALLINT *ColumnCount); + + SQLRETURN SQL_API SQLParamData(SQLHSTMT StatementHandle, + SQLPOINTER *Value); + + SQLRETURN SQL_API SQLPrepare(SQLHSTMT StatementHandle, + SQLCHAR *StatementText, SQLINTEGER TextLength); + + SQLRETURN SQL_API SQLPutData(SQLHSTMT StatementHandle, + SQLPOINTER Data, SQLLEN StrLen_or_Ind); + + SQLRETURN SQL_API SQLRowCount(SQLHSTMT StatementHandle, + SQLLEN *RowCount); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLSetConnectAttr(SQLHDBC ConnectionHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength); +#endif /* ODBCVER >= 0x0300 */ + + SQLRETURN SQL_API SQLSetConnectOption(SQLHDBC ConnectionHandle, + SQLUSMALLINT Option, SQLULEN Value); + + SQLRETURN SQL_API SQLSetCursorName(SQLHSTMT StatementHandle, + SQLCHAR *CursorName, SQLSMALLINT NameLength); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLSetDescField(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, SQLINTEGER BufferLength); + + SQLRETURN SQL_API SQLSetDescRec(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, SQLSMALLINT Type, + SQLSMALLINT SubType, SQLLEN Length, + SQLSMALLINT Precision, SQLSMALLINT Scale, + SQLPOINTER Data, SQLLEN *StringLength, + SQLLEN *Indicator); + + SQLRETURN SQL_API SQLSetEnvAttr(SQLHENV EnvironmentHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength); +#endif /* ODBCVER >= 0x0300 */ + + SQLRETURN SQL_API SQLSetParam(SQLHSTMT StatementHandle, + SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, + SQLSMALLINT ParameterType, SQLULEN LengthPrecision, + SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, + SQLLEN *StrLen_or_Ind); + +#if (ODBCVER >= 0x0300) + SQLRETURN SQL_API SQLSetStmtAttr(SQLHSTMT StatementHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength); +#endif + + SQLRETURN SQL_API SQLSetStmtOption(SQLHSTMT StatementHandle, + SQLUSMALLINT Option, SQLULEN Value); + + SQLRETURN SQL_API SQLSpecialColumns(SQLHSTMT StatementHandle, + SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName, + SQLSMALLINT NameLength1, SQLCHAR *SchemaName, + SQLSMALLINT NameLength2, SQLCHAR *TableName, + SQLSMALLINT NameLength3, SQLUSMALLINT Scope, + SQLUSMALLINT Nullable); + + SQLRETURN SQL_API SQLStatistics(SQLHSTMT StatementHandle, + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, + SQLUSMALLINT Unique, SQLUSMALLINT Reserved); + + SQLRETURN SQL_API SQLTables(SQLHSTMT StatementHandle, + SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, + SQLCHAR *TableType, SQLSMALLINT NameLength4); + + SQLRETURN SQL_API SQLTransact(SQLHENV EnvironmentHandle, + SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/external/unixODBC/inc/odbc/sqlext.h b/external/unixODBC/inc/odbc/sqlext.h new file mode 100644 index 000000000..5bc9d7d80 --- /dev/null +++ b/external/unixODBC/inc/odbc/sqlext.h @@ -0,0 +1,2122 @@ +/***************************************************** + * sqlext.h + * + * These should be consistent with the MS version. + * + *****************************************************/ +#ifndef __SQLEXT_H +#define __SQLEXT_H + + +/* BEGIN - unixODBC ONLY (programs like ODBCConfig and DataManager use these) */ + +/* COLUMNS IN SQLTables() RESULT SET */ +#define SQLTables_TABLE_CATALOG 1 +#define SQLTables_TABLE_SCHEM 2 +#define SQLTables_TABLE_NAME 3 +#define SQLTables_TABLE_TYPE 4 +#define SQLTables_REMARKS 5 + +/* COLUMNS IN SQLColumns() RESULT SET */ +#define SQLColumns_TABLE_CAT 1 +#define SQLColumns_TABLE_SCHEM 2 +#define SQLColumns_TABLE_NAME 3 +#define SQLColumns_COLUMN_NAME 4 +#define SQLColumns_DATA_TYPE 5 +#define SQLColumns_TYPE_NAME 6 +#define SQLColumns_COLUMN_SIZE 7 +#define SQLColumns_BUFFER_LENGTH 8 +#define SQLColumns_DECIMAL_DIGITS 9 +#define SQLColumns_NUM_PREC_RADIX 10 +#define SQLColumns_NULLABLE 11 +#define SQLColumns_REMARKS 12 +#define SQLColumns_COLUMN_DEF 13 +#define SQLColumns_SQL_DATA_TYPE 14 +#define SQLColumns_SQL_DATETIME_SUB 15 +#define SQLColumns_CHAR_OCTET_LENGTH 16 +#define SQLColumns_ORDINAL_POSITION 17 +#define SQLColumns_IS_NULLABLE 18 + +/* END - unixODBC ONLY */ + +#ifndef __SQL_H +#include "odbc/sql.h" +#endif + +#ifdef __cplusplus +extern "C" { /* Assume C declarations for C++ */ +#endif + +/* generally useful constants */ +#define SQL_SPEC_MAJOR 3 /* Major version of specification */ +#define SQL_SPEC_MINOR 52 /* Minor version of specification */ +#define SQL_SPEC_STRING "03.52" /* String constant for version */ + +#define SQL_SQLSTATE_SIZE 5 /* size of SQLSTATE */ +#define SQL_MAX_DSN_LENGTH 32 /* maximum data source name size */ + +#define SQL_MAX_OPTION_STRING_LENGTH 256 + +/* return code SQL_NO_DATA_FOUND is the same as SQL_NO_DATA */ +#if (ODBCVER < 0x0300) +#define SQL_NO_DATA_FOUND 100 +#else +#define SQL_NO_DATA_FOUND SQL_NO_DATA +#endif + +/* an end handle type */ +#if (ODBCVER >= 0x0300) +#define SQL_HANDLE_SENV 5 +#endif /* ODBCVER >= 0x0300 */ + +/* env attribute */ +#if (ODBCVER >= 0x0300) +#define SQL_ATTR_ODBC_VERSION 200 +#define SQL_ATTR_CONNECTION_POOLING 201 +#define SQL_ATTR_CP_MATCH 202 + +/* unixODBC additions */ +#define SQL_ATTR_UNIXODBC_SYSPATH 65001 +#define SQL_ATTR_UNIXODBC_VERSION 65002 +#define SQL_ATTR_UNIXODBC_ENVATTR 65003 +#endif /* ODBCVER >= 0x0300 */ + +#if (ODBCVER >= 0x0300) +/* values for SQL_ATTR_CONNECTION_POOLING */ +#define SQL_CP_OFF 0UL +#define SQL_CP_ONE_PER_DRIVER 1UL +#define SQL_CP_ONE_PER_HENV 2UL +#define SQL_CP_DEFAULT SQL_CP_OFF + +/* values for SQL_ATTR_CP_MATCH */ +#define SQL_CP_STRICT_MATCH 0UL +#define SQL_CP_RELAXED_MATCH 1UL +#define SQL_CP_MATCH_DEFAULT SQL_CP_STRICT_MATCH + +/* values for SQL_ATTR_ODBC_VERSION */ +#define SQL_OV_ODBC2 2UL +#define SQL_OV_ODBC3 3UL +#endif /* ODBCVER >= 0x0300 */ + +/* connection attributes */ +#define SQL_ACCESS_MODE 101 +#define SQL_AUTOCOMMIT 102 +#define SQL_LOGIN_TIMEOUT 103 +#define SQL_OPT_TRACE 104 +#define SQL_OPT_TRACEFILE 105 +#define SQL_TRANSLATE_DLL 106 +#define SQL_TRANSLATE_OPTION 107 +#define SQL_TXN_ISOLATION 108 +#define SQL_CURRENT_QUALIFIER 109 +#define SQL_ODBC_CURSORS 110 +#define SQL_QUIET_MODE 111 +#define SQL_PACKET_SIZE 112 + +/* connection attributes with new names */ +#if (ODBCVER >= 0x0300) +#define SQL_ATTR_ACCESS_MODE SQL_ACCESS_MODE +#define SQL_ATTR_AUTOCOMMIT SQL_AUTOCOMMIT +#define SQL_ATTR_CONNECTION_TIMEOUT 113 +#define SQL_ATTR_CURRENT_CATALOG SQL_CURRENT_QUALIFIER +#define SQL_ATTR_DISCONNECT_BEHAVIOR 114 +#define SQL_ATTR_ENLIST_IN_DTC 1207 +#define SQL_ATTR_ENLIST_IN_XA 1208 +#define SQL_ATTR_LOGIN_TIMEOUT SQL_LOGIN_TIMEOUT +#define SQL_ATTR_ODBC_CURSORS SQL_ODBC_CURSORS +#define SQL_ATTR_PACKET_SIZE SQL_PACKET_SIZE +#define SQL_ATTR_QUIET_MODE SQL_QUIET_MODE +#define SQL_ATTR_TRACE SQL_OPT_TRACE +#define SQL_ATTR_TRACEFILE SQL_OPT_TRACEFILE +#define SQL_ATTR_TRANSLATE_LIB SQL_TRANSLATE_DLL +#define SQL_ATTR_TRANSLATE_OPTION SQL_TRANSLATE_OPTION +#define SQL_ATTR_TXN_ISOLATION SQL_TXN_ISOLATION +#endif /* ODBCVER >= 0x0300 */ + +#define SQL_ATTR_CONNECTION_DEAD 1209 /* GetConnectAttr only */ + +#define SQL_ATTR_DRIVER_THREADING 1028 /* Driver threading level */ + +#if (ODBCVER >= 0x0351) +/* ODBC Driver Manager sets this connection attribute to a unicode driver + (which supports SQLConnectW) when the application is an ANSI application + (which calls SQLConnect, SQLDriverConnect, or SQLBrowseConnect). + This is SetConnectAttr only and application does not set this attribute + This attribute was introduced because some unicode driver's some APIs may + need to behave differently on ANSI or Unicode applications. A unicode + driver, which has same behavior for both ANSI or Unicode applications, + should return SQL_ERROR when the driver manager sets this connection + attribute. When a unicode driver returns SQL_SUCCESS on this attribute, + the driver manager treates ANSI and Unicode connections differently in + connection pooling. +*/ +#define SQL_ATTR_ANSI_APP 115 +#endif + +/* SQL_CONNECT_OPT_DRVR_START is not meaningful for 3.0 driver */ +#if (ODBCVER < 0x0300) +#define SQL_CONNECT_OPT_DRVR_START 1000 +#endif /* ODBCVER < 0x0300 */ + +#if (ODBCVER < 0x0300) +#define SQL_CONN_OPT_MAX SQL_PACKET_SIZE +#define SQL_CONN_OPT_MIN SQL_ACCESS_MODE +#endif /* ODBCVER < 0x0300 */ + +/* SQL_ACCESS_MODE options */ +#define SQL_MODE_READ_WRITE 0UL +#define SQL_MODE_READ_ONLY 1UL +#define SQL_MODE_DEFAULT SQL_MODE_READ_WRITE + +/* SQL_AUTOCOMMIT options */ +#define SQL_AUTOCOMMIT_OFF 0UL +#define SQL_AUTOCOMMIT_ON 1UL +#define SQL_AUTOCOMMIT_DEFAULT SQL_AUTOCOMMIT_ON + +/* SQL_LOGIN_TIMEOUT options */ +#define SQL_LOGIN_TIMEOUT_DEFAULT 15UL + +/* SQL_OPT_TRACE options */ +#define SQL_OPT_TRACE_OFF 0UL +#define SQL_OPT_TRACE_ON 1UL +#define SQL_OPT_TRACE_DEFAULT SQL_OPT_TRACE_OFF +#define SQL_OPT_TRACE_FILE_DEFAULT "/tmp/SQL.LOG" + +/* SQL_ODBC_CURSORS options */ +#define SQL_CUR_USE_IF_NEEDED 0UL +#define SQL_CUR_USE_ODBC 1UL +#define SQL_CUR_USE_DRIVER 2UL +#define SQL_CUR_DEFAULT SQL_CUR_USE_DRIVER + +#if (ODBCVER >= 0x0300) +/* values for SQL_ATTR_DISCONNECT_BEHAVIOR */ +#define SQL_DB_RETURN_TO_POOL 0UL +#define SQL_DB_DISCONNECT 1UL +#define SQL_DB_DEFAULT SQL_DB_RETURN_TO_POOL + +/* values for SQL_ATTR_ENLIST_IN_DTC */ +#define SQL_DTC_DONE 0L +#endif /* ODBCVER >= 0x0300 */ + +/* values for SQL_ATTR_CONNECTION_DEAD */ +#define SQL_CD_TRUE 1L /* Connection is closed/dead */ +#define SQL_CD_FALSE 0L /* Connection is open/available */ + +/* values for SQL_ATTR_ANSI_APP */ +#if (ODBCVER >= 0x0351) +#define SQL_AA_TRUE 1L /* the application is an ANSI app */ +#define SQL_AA_FALSE 0L /* the application is a Unicode app */ +#endif + +/* statement attributes */ +#define SQL_QUERY_TIMEOUT 0 +#define SQL_MAX_ROWS 1 +#define SQL_NOSCAN 2 +#define SQL_MAX_LENGTH 3 +#define SQL_ASYNC_ENABLE 4 /* same as SQL_ATTR_ASYNC_ENABLE */ +#define SQL_BIND_TYPE 5 +#define SQL_CURSOR_TYPE 6 +#define SQL_CONCURRENCY 7 +#define SQL_KEYSET_SIZE 8 +#define SQL_ROWSET_SIZE 9 +#define SQL_SIMULATE_CURSOR 10 +#define SQL_RETRIEVE_DATA 11 +#define SQL_USE_BOOKMARKS 12 +#define SQL_GET_BOOKMARK 13 /* GetStmtOption Only */ +#define SQL_ROW_NUMBER 14 /* GetStmtOption Only */ + +/* statement attributes for ODBC 3.0 */ +#if (ODBCVER >= 0x0300) +#define SQL_ATTR_ASYNC_ENABLE 4 +#define SQL_ATTR_CONCURRENCY SQL_CONCURRENCY +#define SQL_ATTR_CURSOR_TYPE SQL_CURSOR_TYPE +#define SQL_ATTR_ENABLE_AUTO_IPD 15 +#define SQL_ATTR_FETCH_BOOKMARK_PTR 16 +#define SQL_ATTR_KEYSET_SIZE SQL_KEYSET_SIZE +#define SQL_ATTR_MAX_LENGTH SQL_MAX_LENGTH +#define SQL_ATTR_MAX_ROWS SQL_MAX_ROWS +#define SQL_ATTR_NOSCAN SQL_NOSCAN +#define SQL_ATTR_PARAM_BIND_OFFSET_PTR 17 +#define SQL_ATTR_PARAM_BIND_TYPE 18 +#define SQL_ATTR_PARAM_OPERATION_PTR 19 +#define SQL_ATTR_PARAM_STATUS_PTR 20 +#define SQL_ATTR_PARAMS_PROCESSED_PTR 21 +#define SQL_ATTR_PARAMSET_SIZE 22 +#define SQL_ATTR_QUERY_TIMEOUT SQL_QUERY_TIMEOUT +#define SQL_ATTR_RETRIEVE_DATA SQL_RETRIEVE_DATA +#define SQL_ATTR_ROW_BIND_OFFSET_PTR 23 +#define SQL_ATTR_ROW_BIND_TYPE SQL_BIND_TYPE +#define SQL_ATTR_ROW_NUMBER SQL_ROW_NUMBER /*GetStmtAttr*/ +#define SQL_ATTR_ROW_OPERATION_PTR 24 +#define SQL_ATTR_ROW_STATUS_PTR 25 +#define SQL_ATTR_ROWS_FETCHED_PTR 26 +#define SQL_ATTR_ROW_ARRAY_SIZE 27 +#define SQL_ATTR_SIMULATE_CURSOR SQL_SIMULATE_CURSOR +#define SQL_ATTR_USE_BOOKMARKS SQL_USE_BOOKMARKS + +#endif /* ODBCVER >= 0x0300 */ + +#if (ODBCVER < 0x0300) +#define SQL_STMT_OPT_MAX SQL_ROW_NUMBER +#define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT +#endif /* ODBCVER < 0x0300 */ + +/* New defines for SEARCHABLE column in SQLGetTypeInfo */ + +#if (ODBCVER >= 0x0300) +#define SQL_COL_PRED_CHAR SQL_LIKE_ONLY +#define SQL_COL_PRED_BASIC SQL_ALL_EXCEPT_LIKE +#endif /* ODBCVER >= 0x0300 */ + + + +/* whether an attribute is a pointer or not */ +#if (ODBCVER >= 0x0300) +#define SQL_IS_POINTER (-4) +#define SQL_IS_UINTEGER (-5) +#define SQL_IS_INTEGER (-6) +#define SQL_IS_USMALLINT (-7) +#define SQL_IS_SMALLINT (-8) +#endif /* ODBCVER >= 0x0300 */ + +/* the value of SQL_ATTR_PARAM_BIND_TYPE */ +#if (ODBCVER >= 0x0300) +#define SQL_PARAM_BIND_BY_COLUMN 0UL +#define SQL_PARAM_BIND_TYPE_DEFAULT SQL_PARAM_BIND_BY_COLUMN +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_QUERY_TIMEOUT options */ +#define SQL_QUERY_TIMEOUT_DEFAULT 0UL + +/* SQL_MAX_ROWS options */ +#define SQL_MAX_ROWS_DEFAULT 0UL + +/* SQL_NOSCAN options */ +#define SQL_NOSCAN_OFF 0UL /* 1.0 FALSE */ +#define SQL_NOSCAN_ON 1UL /* 1.0 TRUE */ +#define SQL_NOSCAN_DEFAULT SQL_NOSCAN_OFF + +/* SQL_MAX_LENGTH options */ +#define SQL_MAX_LENGTH_DEFAULT 0UL + +/* values for SQL_ATTR_ASYNC_ENABLE */ +#define SQL_ASYNC_ENABLE_OFF 0UL +#define SQL_ASYNC_ENABLE_ON 1UL +#define SQL_ASYNC_ENABLE_DEFAULT SQL_ASYNC_ENABLE_OFF + +/* SQL_BIND_TYPE options */ +#define SQL_BIND_BY_COLUMN 0UL +#define SQL_BIND_TYPE_DEFAULT SQL_BIND_BY_COLUMN /* Default value */ + +/* SQL_CONCURRENCY options */ +#define SQL_CONCUR_READ_ONLY 1 +#define SQL_CONCUR_LOCK 2 +#define SQL_CONCUR_ROWVER 3 +#define SQL_CONCUR_VALUES 4 +#define SQL_CONCUR_DEFAULT SQL_CONCUR_READ_ONLY /* Default value */ + +/* SQL_CURSOR_TYPE options */ +#define SQL_CURSOR_FORWARD_ONLY 0UL +#define SQL_CURSOR_KEYSET_DRIVEN 1UL +#define SQL_CURSOR_DYNAMIC 2UL +#define SQL_CURSOR_STATIC 3UL +#define SQL_CURSOR_TYPE_DEFAULT SQL_CURSOR_FORWARD_ONLY /* Default value */ + +/* SQL_ROWSET_SIZE options */ +#define SQL_ROWSET_SIZE_DEFAULT 1UL + +/* SQL_KEYSET_SIZE options */ +#define SQL_KEYSET_SIZE_DEFAULT 0UL + +/* SQL_SIMULATE_CURSOR options */ +#define SQL_SC_NON_UNIQUE 0UL +#define SQL_SC_TRY_UNIQUE 1UL +#define SQL_SC_UNIQUE 2UL + +/* SQL_RETRIEVE_DATA options */ +#define SQL_RD_OFF 0UL +#define SQL_RD_ON 1UL +#define SQL_RD_DEFAULT SQL_RD_ON + +/* SQL_USE_BOOKMARKS options */ +#define SQL_UB_OFF 0UL +#define SQL_UB_ON 01UL +#define SQL_UB_DEFAULT SQL_UB_OFF + +/* New values for SQL_USE_BOOKMARKS attribute */ +#if (ODBCVER >= 0x0300) +#define SQL_UB_FIXED SQL_UB_ON +#define SQL_UB_VARIABLE 2UL +#endif /* ODBCVER >= 0x0300 */ + +/* extended descriptor field */ +#if (ODBCVER >= 0x0300) +#define SQL_DESC_ARRAY_SIZE 20 +#define SQL_DESC_ARRAY_STATUS_PTR 21 +#define SQL_DESC_AUTO_UNIQUE_VALUE SQL_COLUMN_AUTO_INCREMENT +#define SQL_DESC_BASE_COLUMN_NAME 22 +#define SQL_DESC_BASE_TABLE_NAME 23 +#define SQL_DESC_BIND_OFFSET_PTR 24 +#define SQL_DESC_BIND_TYPE 25 +#define SQL_DESC_CASE_SENSITIVE SQL_COLUMN_CASE_SENSITIVE +#define SQL_DESC_CATALOG_NAME SQL_COLUMN_QUALIFIER_NAME +#define SQL_DESC_CONCISE_TYPE SQL_COLUMN_TYPE +#define SQL_DESC_DATETIME_INTERVAL_PRECISION 26 +#define SQL_DESC_DISPLAY_SIZE SQL_COLUMN_DISPLAY_SIZE +#define SQL_DESC_FIXED_PREC_SCALE SQL_COLUMN_MONEY +#define SQL_DESC_LABEL SQL_COLUMN_LABEL +#define SQL_DESC_LITERAL_PREFIX 27 +#define SQL_DESC_LITERAL_SUFFIX 28 +#define SQL_DESC_LOCAL_TYPE_NAME 29 +#define SQL_DESC_MAXIMUM_SCALE 30 +#define SQL_DESC_MINIMUM_SCALE 31 +#define SQL_DESC_NUM_PREC_RADIX 32 +#define SQL_DESC_PARAMETER_TYPE 33 +#define SQL_DESC_ROWS_PROCESSED_PTR 34 +#if (ODBCVER >= 0x0350) +#define SQL_DESC_ROWVER 35 +#endif /* ODBCVER >= 0x0350 */ +#define SQL_DESC_SCHEMA_NAME SQL_COLUMN_OWNER_NAME +#define SQL_DESC_SEARCHABLE SQL_COLUMN_SEARCHABLE +#define SQL_DESC_TYPE_NAME SQL_COLUMN_TYPE_NAME +#define SQL_DESC_TABLE_NAME SQL_COLUMN_TABLE_NAME +#define SQL_DESC_UNSIGNED SQL_COLUMN_UNSIGNED +#define SQL_DESC_UPDATABLE SQL_COLUMN_UPDATABLE +#endif /* ODBCVER >= 0x0300 */ + + +/* defines for diagnostics fields */ +#if (ODBCVER >= 0x0300) +#define SQL_DIAG_CURSOR_ROW_COUNT (-1249) +#define SQL_DIAG_ROW_NUMBER (-1248) +#define SQL_DIAG_COLUMN_NUMBER (-1247) +#endif /* ODBCVER >= 0x0300 */ + +/* SQL extended datatypes */ +#define SQL_DATE 9 +#if (ODBCVER >= 0x0300) +#define SQL_INTERVAL 10 +#endif /* ODBCVER >= 0x0300 */ +#define SQL_TIME 10 +#define SQL_TIMESTAMP 11 +#define SQL_LONGVARCHAR (-1) +#define SQL_BINARY (-2) +#define SQL_VARBINARY (-3) +#define SQL_LONGVARBINARY (-4) +#define SQL_BIGINT (-5) +#define SQL_TINYINT (-6) +#define SQL_BIT (-7) +#if (ODBCVER >= 0x0350) +#define SQL_GUID (-11) +#endif /* ODBCVER >= 0x0350 */ + +#if (ODBCVER >= 0x0300) +/* interval code */ +#define SQL_CODE_YEAR 1 +#define SQL_CODE_MONTH 2 +#define SQL_CODE_DAY 3 +#define SQL_CODE_HOUR 4 +#define SQL_CODE_MINUTE 5 +#define SQL_CODE_SECOND 6 +#define SQL_CODE_YEAR_TO_MONTH 7 +#define SQL_CODE_DAY_TO_HOUR 8 +#define SQL_CODE_DAY_TO_MINUTE 9 +#define SQL_CODE_DAY_TO_SECOND 10 +#define SQL_CODE_HOUR_TO_MINUTE 11 +#define SQL_CODE_HOUR_TO_SECOND 12 +#define SQL_CODE_MINUTE_TO_SECOND 13 + +#define SQL_INTERVAL_YEAR (100 + SQL_CODE_YEAR) +#define SQL_INTERVAL_MONTH (100 + SQL_CODE_MONTH) +#define SQL_INTERVAL_DAY (100 + SQL_CODE_DAY) +#define SQL_INTERVAL_HOUR (100 + SQL_CODE_HOUR) +#define SQL_INTERVAL_MINUTE (100 + SQL_CODE_MINUTE) +#define SQL_INTERVAL_SECOND (100 + SQL_CODE_SECOND) +#define SQL_INTERVAL_YEAR_TO_MONTH (100 + SQL_CODE_YEAR_TO_MONTH) +#define SQL_INTERVAL_DAY_TO_HOUR (100 + SQL_CODE_DAY_TO_HOUR) +#define SQL_INTERVAL_DAY_TO_MINUTE (100 + SQL_CODE_DAY_TO_MINUTE) +#define SQL_INTERVAL_DAY_TO_SECOND (100 + SQL_CODE_DAY_TO_SECOND) +#define SQL_INTERVAL_HOUR_TO_MINUTE (100 + SQL_CODE_HOUR_TO_MINUTE) +#define SQL_INTERVAL_HOUR_TO_SECOND (100 + SQL_CODE_HOUR_TO_SECOND) +#define SQL_INTERVAL_MINUTE_TO_SECOND (100 + SQL_CODE_MINUTE_TO_SECOND) + +#else +#define SQL_INTERVAL_YEAR (-80) +#define SQL_INTERVAL_MONTH (-81) +#define SQL_INTERVAL_YEAR_TO_MONTH (-82) +#define SQL_INTERVAL_DAY (-83) +#define SQL_INTERVAL_HOUR (-84) +#define SQL_INTERVAL_MINUTE (-85) +#define SQL_INTERVAL_SECOND (-86) +#define SQL_INTERVAL_DAY_TO_HOUR (-87) +#define SQL_INTERVAL_DAY_TO_MINUTE (-88) +#define SQL_INTERVAL_DAY_TO_SECOND (-89) +#define SQL_INTERVAL_HOUR_TO_MINUTE (-90) +#define SQL_INTERVAL_HOUR_TO_SECOND (-91) +#define SQL_INTERVAL_MINUTE_TO_SECOND (-92) +#endif /* ODBCVER >= 0x0300 */ + + +#if (ODBCVER <= 0x0300) +#define SQL_UNICODE (-95) +#define SQL_UNICODE_VARCHAR (-96) +#define SQL_UNICODE_LONGVARCHAR (-97) +#define SQL_UNICODE_CHAR SQL_UNICODE +#else +/* The previous definitions for SQL_UNICODE_ are historical and obsolete */ + +#define SQL_UNICODE SQL_WCHAR +#define SQL_UNICODE_VARCHAR SQL_WVARCHAR +#define SQL_UNICODE_LONGVARCHAR SQL_WLONGVARCHAR +#define SQL_UNICODE_CHAR SQL_WCHAR +#endif + +#if (ODBCVER < 0x0300) +#define SQL_TYPE_DRIVER_START SQL_INTERVAL_YEAR +#define SQL_TYPE_DRIVER_END SQL_UNICODE_LONGVARCHAR +#endif /* ODBCVER < 0x0300 */ + +/* C datatype to SQL datatype mapping SQL types + ------------------- */ +#define SQL_C_CHAR SQL_CHAR /* CHAR, VARCHAR, DECIMAL, NUMERIC */ +#define SQL_C_LONG SQL_INTEGER /* INTEGER */ +#define SQL_C_SHORT SQL_SMALLINT /* SMALLINT */ +#define SQL_C_FLOAT SQL_REAL /* REAL */ +#define SQL_C_DOUBLE SQL_DOUBLE /* FLOAT, DOUBLE */ +#if (ODBCVER >= 0x0300) +#define SQL_C_NUMERIC SQL_NUMERIC +#endif /* ODBCVER >= 0x0300 */ +#define SQL_C_DEFAULT 99 + +#define SQL_SIGNED_OFFSET (-20) +#define SQL_UNSIGNED_OFFSET (-22) + +/* C datatype to SQL datatype mapping */ +#define SQL_C_DATE SQL_DATE +#define SQL_C_TIME SQL_TIME +#define SQL_C_TIMESTAMP SQL_TIMESTAMP +#if (ODBCVER >= 0x0300) +#define SQL_C_TYPE_DATE SQL_TYPE_DATE +#define SQL_C_TYPE_TIME SQL_TYPE_TIME +#define SQL_C_TYPE_TIMESTAMP SQL_TYPE_TIMESTAMP +#define SQL_C_INTERVAL_YEAR SQL_INTERVAL_YEAR +#define SQL_C_INTERVAL_MONTH SQL_INTERVAL_MONTH +#define SQL_C_INTERVAL_DAY SQL_INTERVAL_DAY +#define SQL_C_INTERVAL_HOUR SQL_INTERVAL_HOUR +#define SQL_C_INTERVAL_MINUTE SQL_INTERVAL_MINUTE +#define SQL_C_INTERVAL_SECOND SQL_INTERVAL_SECOND +#define SQL_C_INTERVAL_YEAR_TO_MONTH SQL_INTERVAL_YEAR_TO_MONTH +#define SQL_C_INTERVAL_DAY_TO_HOUR SQL_INTERVAL_DAY_TO_HOUR +#define SQL_C_INTERVAL_DAY_TO_MINUTE SQL_INTERVAL_DAY_TO_MINUTE +#define SQL_C_INTERVAL_DAY_TO_SECOND SQL_INTERVAL_DAY_TO_SECOND +#define SQL_C_INTERVAL_HOUR_TO_MINUTE SQL_INTERVAL_HOUR_TO_MINUTE +#define SQL_C_INTERVAL_HOUR_TO_SECOND SQL_INTERVAL_HOUR_TO_SECOND +#define SQL_C_INTERVAL_MINUTE_TO_SECOND SQL_INTERVAL_MINUTE_TO_SECOND +#endif /* ODBCVER >= 0x0300 */ +#define SQL_C_BINARY SQL_BINARY +#define SQL_C_BIT SQL_BIT +#if (ODBCVER >= 0x0300) +#define SQL_C_SBIGINT (SQL_BIGINT+SQL_SIGNED_OFFSET) /* SIGNED BIGINT */ +#define SQL_C_UBIGINT (SQL_BIGINT+SQL_UNSIGNED_OFFSET) /* UNSIGNED BIGINT */ +#endif /* ODBCVER >= 0x0300 */ +#define SQL_C_TINYINT SQL_TINYINT +#define SQL_C_SLONG (SQL_C_LONG+SQL_SIGNED_OFFSET) /* SIGNED INTEGER */ +#define SQL_C_SSHORT (SQL_C_SHORT+SQL_SIGNED_OFFSET) /* SIGNED SMALLINT */ +#define SQL_C_STINYINT (SQL_TINYINT+SQL_SIGNED_OFFSET) /* SIGNED TINYINT */ +#define SQL_C_ULONG (SQL_C_LONG+SQL_UNSIGNED_OFFSET) /* UNSIGNED INTEGER*/ +#define SQL_C_USHORT (SQL_C_SHORT+SQL_UNSIGNED_OFFSET) /* UNSIGNED SMALLINT*/ +#define SQL_C_UTINYINT (SQL_TINYINT+SQL_UNSIGNED_OFFSET) /* UNSIGNED TINYINT*/ + +#if (ODBCVER >= 0x0300) && (SIZEOF_LONG_INT == 8) && !defined(BUILD_LEGACY_64_BIT_MODE) +#define SQL_C_BOOKMARK SQL_C_UBIGINT /* BOOKMARK */ +#else +#define SQL_C_BOOKMARK SQL_C_ULONG /* BOOKMARK */ +#endif + +#if (ODBCVER >= 0x0350) +#define SQL_C_GUID SQL_GUID +#endif /* ODBCVER >= 0x0350 */ + +#define SQL_TYPE_NULL 0 +#if (ODBCVER < 0x0300) +#define SQL_TYPE_MIN SQL_BIT +#define SQL_TYPE_MAX SQL_VARCHAR +#endif + +#if (ODBCVER >= 0x0300) +#define SQL_C_VARBOOKMARK SQL_C_BINARY +#endif /* ODBCVER >= 0x0300 */ + +/* define for SQL_DIAG_ROW_NUMBER and SQL_DIAG_COLUMN_NUMBER */ +#if (ODBCVER >= 0x0300) +#define SQL_NO_ROW_NUMBER (-1) +#define SQL_NO_COLUMN_NUMBER (-1) +#define SQL_ROW_NUMBER_UNKNOWN (-2) +#define SQL_COLUMN_NUMBER_UNKNOWN (-2) +#endif + +/* SQLBindParameter extensions */ +#define SQL_DEFAULT_PARAM (-5) +#define SQL_IGNORE (-6) +#if (ODBCVER >= 0x0300) +#define SQL_COLUMN_IGNORE SQL_IGNORE +#endif /* ODBCVER >= 0x0300 */ +#define SQL_LEN_DATA_AT_EXEC_OFFSET (-100) +#define SQL_LEN_DATA_AT_EXEC(length) (-(length)+SQL_LEN_DATA_AT_EXEC_OFFSET) + +/* binary length for driver specific attributes */ +#define SQL_LEN_BINARY_ATTR_OFFSET (-100) +#define SQL_LEN_BINARY_ATTR(length) (-(length)+SQL_LEN_BINARY_ATTR_OFFSET) + +/* Defines used by Driver Manager when mapping SQLSetParam to SQLBindParameter +*/ +#define SQL_PARAM_TYPE_DEFAULT SQL_PARAM_INPUT_OUTPUT +#define SQL_SETPARAM_VALUE_MAX (-1L) + +/* SQLColAttributes defines */ +#define SQL_COLUMN_COUNT 0 +#define SQL_COLUMN_NAME 1 +#define SQL_COLUMN_TYPE 2 +#define SQL_COLUMN_LENGTH 3 +#define SQL_COLUMN_PRECISION 4 +#define SQL_COLUMN_SCALE 5 +#define SQL_COLUMN_DISPLAY_SIZE 6 +#define SQL_COLUMN_NULLABLE 7 +#define SQL_COLUMN_UNSIGNED 8 +#define SQL_COLUMN_MONEY 9 +#define SQL_COLUMN_UPDATABLE 10 +#define SQL_COLUMN_AUTO_INCREMENT 11 +#define SQL_COLUMN_CASE_SENSITIVE 12 +#define SQL_COLUMN_SEARCHABLE 13 +#define SQL_COLUMN_TYPE_NAME 14 +#define SQL_COLUMN_TABLE_NAME 15 +#define SQL_COLUMN_OWNER_NAME 16 +#define SQL_COLUMN_QUALIFIER_NAME 17 +#define SQL_COLUMN_LABEL 18 +#define SQL_COLATT_OPT_MAX SQL_COLUMN_LABEL +#if (ODBCVER < 0x0300) +#define SQL_COLUMN_DRIVER_START 1000 +#endif /* ODBCVER < 0x0300 */ + +#define SQL_COLATT_OPT_MIN SQL_COLUMN_COUNT + +/* SQLColAttributes subdefines for SQL_COLUMN_UPDATABLE */ +#define SQL_ATTR_READONLY 0 +#define SQL_ATTR_WRITE 1 +#define SQL_ATTR_READWRITE_UNKNOWN 2 + +/* SQLColAttributes subdefines for SQL_COLUMN_SEARCHABLE */ +/* These are also used by SQLGetInfo */ +#define SQL_UNSEARCHABLE 0 +#define SQL_LIKE_ONLY 1 +#define SQL_ALL_EXCEPT_LIKE 2 +#define SQL_SEARCHABLE 3 +#define SQL_PRED_SEARCHABLE SQL_SEARCHABLE + + +/* Special return values for SQLGetData */ +#define SQL_NO_TOTAL (-4) + +/********************************************/ +/* SQLGetFunctions: additional values for */ +/* Function to represent functions that */ +/* are not in the X/Open spec. */ +/********************************************/ + +#if (ODBCVER >= 0x0300) +#define SQL_API_SQLALLOCHANDLESTD 73 +#define SQL_API_SQLBULKOPERATIONS 24 +#endif /* ODBCVER >= 0x0300 */ +#define SQL_API_SQLBINDPARAMETER 72 +#define SQL_API_SQLBROWSECONNECT 55 +#define SQL_API_SQLCOLATTRIBUTES 6 +#define SQL_API_SQLCOLUMNPRIVILEGES 56 +#define SQL_API_SQLDESCRIBEPARAM 58 +#define SQL_API_SQLDRIVERCONNECT 41 +#define SQL_API_SQLDRIVERS 71 +#define SQL_API_SQLEXTENDEDFETCH 59 +#define SQL_API_SQLFOREIGNKEYS 60 +#define SQL_API_SQLMORERESULTS 61 +#define SQL_API_SQLNATIVESQL 62 +#define SQL_API_SQLNUMPARAMS 63 +#define SQL_API_SQLPARAMOPTIONS 64 +#define SQL_API_SQLPRIMARYKEYS 65 +#define SQL_API_SQLPROCEDURECOLUMNS 66 +#define SQL_API_SQLPROCEDURES 67 +#define SQL_API_SQLSETPOS 68 +#define SQL_API_SQLSETSCROLLOPTIONS 69 +#define SQL_API_SQLTABLEPRIVILEGES 70 + +/*-------------------------------------------*/ +/* SQL_EXT_API_LAST is not useful with ODBC */ +/* version 3.0 because some of the values */ +/* from X/Open are in the 10000 range. */ +/*-------------------------------------------*/ + +#if (ODBCVER < 0x0300) +#define SQL_EXT_API_LAST SQL_API_SQLBINDPARAMETER +#define SQL_NUM_FUNCTIONS 23 +#define SQL_EXT_API_START 40 +#define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST-SQL_EXT_API_START+1) +#endif + +/*--------------------------------------------*/ +/* SQL_API_ALL_FUNCTIONS returns an array */ +/* of 'booleans' representing whether a */ +/* function is implemented by the driver. */ +/* */ +/* CAUTION: Only functions defined in ODBC */ +/* version 2.0 and earlier are returned, the */ +/* new high-range function numbers defined by */ +/* X/Open break this scheme. See the new */ +/* method -- SQL_API_ODBC3_ALL_FUNCTIONS */ +/*--------------------------------------------*/ + +#define SQL_API_ALL_FUNCTIONS 0 /* See CAUTION above */ + +/*----------------------------------------------*/ +/* 2.X drivers export a dummy function with */ +/* ordinal number SQL_API_LOADBYORDINAL to speed*/ +/* loading under the windows operating system. */ +/* */ +/* CAUTION: Loading by ordinal is not supported */ +/* for 3.0 and above drivers. */ +/*----------------------------------------------*/ + +#define SQL_API_LOADBYORDINAL 199 /* See CAUTION above */ + +/*----------------------------------------------*/ +/* SQL_API_ODBC3_ALL_FUNCTIONS */ +/* This returns a bitmap, which allows us to */ +/* handle the higher-valued function numbers. */ +/* Use SQL_FUNC_EXISTS(bitmap,function_number) */ +/* to determine if the function exists. */ +/*----------------------------------------------*/ + + +#if (ODBCVER >= 0x0300) +#define SQL_API_ODBC3_ALL_FUNCTIONS 999 +#define SQL_API_ODBC3_ALL_FUNCTIONS_SIZE 250 /* array of 250 words */ + + +#define SQL_FUNC_EXISTS(pfExists, uwAPI) ((*(((UWORD*) (pfExists)) + ((uwAPI) >> 4)) & (1 << ((uwAPI) & 0x000F)) ) ? SQL_TRUE : SQL_FALSE ) + +#endif /* ODBCVER >= 0x0300 */ + + +/************************************************/ +/* Extended definitions for SQLGetInfo */ +/************************************************/ + +/*---------------------------------*/ +/* Values in ODBC 2.0 that are not */ +/* in the X/Open spec */ +/*---------------------------------*/ + +#define SQL_INFO_FIRST 0 +#define SQL_ACTIVE_CONNECTIONS 0 /* MAX_DRIVER_CONNECTIONS */ +#define SQL_ACTIVE_STATEMENTS 1 /* MAX_CONCURRENT_ACTIVITIES */ +#define SQL_DRIVER_HDBC 3 +#define SQL_DRIVER_HENV 4 +#define SQL_DRIVER_HSTMT 5 +#define SQL_DRIVER_NAME 6 +#define SQL_DRIVER_VER 7 +#define SQL_ODBC_API_CONFORMANCE 9 +#define SQL_ODBC_VER 10 +#define SQL_ROW_UPDATES 11 +#define SQL_ODBC_SAG_CLI_CONFORMANCE 12 +#define SQL_ODBC_SQL_CONFORMANCE 15 +#define SQL_PROCEDURES 21 +#define SQL_CONCAT_NULL_BEHAVIOR 22 +#define SQL_CURSOR_ROLLBACK_BEHAVIOR 24 +#define SQL_EXPRESSIONS_IN_ORDERBY 27 +#define SQL_MAX_OWNER_NAME_LEN 32 /* MAX_SCHEMA_NAME_LEN */ +#define SQL_MAX_PROCEDURE_NAME_LEN 33 +#define SQL_MAX_QUALIFIER_NAME_LEN 34 /* MAX_CATALOG_NAME_LEN */ +#define SQL_MULT_RESULT_SETS 36 +#define SQL_MULTIPLE_ACTIVE_TXN 37 +#define SQL_OUTER_JOINS 38 +#define SQL_OWNER_TERM 39 +#define SQL_PROCEDURE_TERM 40 +#define SQL_QUALIFIER_NAME_SEPARATOR 41 +#define SQL_QUALIFIER_TERM 42 +#define SQL_SCROLL_OPTIONS 44 +#define SQL_TABLE_TERM 45 +#define SQL_CONVERT_FUNCTIONS 48 +#define SQL_NUMERIC_FUNCTIONS 49 +#define SQL_STRING_FUNCTIONS 50 +#define SQL_SYSTEM_FUNCTIONS 51 +#define SQL_TIMEDATE_FUNCTIONS 52 +#define SQL_CONVERT_BIGINT 53 +#define SQL_CONVERT_BINARY 54 +#define SQL_CONVERT_BIT 55 +#define SQL_CONVERT_CHAR 56 +#define SQL_CONVERT_DATE 57 +#define SQL_CONVERT_DECIMAL 58 +#define SQL_CONVERT_DOUBLE 59 +#define SQL_CONVERT_FLOAT 60 +#define SQL_CONVERT_INTEGER 61 +#define SQL_CONVERT_LONGVARCHAR 62 +#define SQL_CONVERT_NUMERIC 63 +#define SQL_CONVERT_REAL 64 +#define SQL_CONVERT_SMALLINT 65 +#define SQL_CONVERT_TIME 66 +#define SQL_CONVERT_TIMESTAMP 67 +#define SQL_CONVERT_TINYINT 68 +#define SQL_CONVERT_VARBINARY 69 +#define SQL_CONVERT_VARCHAR 70 +#define SQL_CONVERT_LONGVARBINARY 71 +#define SQL_CONVERT_GUID 173 +#define SQL_ODBC_SQL_OPT_IEF 73 /* SQL_INTEGRITY */ +#define SQL_CORRELATION_NAME 74 +#define SQL_NON_NULLABLE_COLUMNS 75 +#define SQL_DRIVER_HLIB 76 +#define SQL_DRIVER_ODBC_VER 77 +#define SQL_LOCK_TYPES 78 +#define SQL_POS_OPERATIONS 79 +#define SQL_POSITIONED_STATEMENTS 80 +#define SQL_BOOKMARK_PERSISTENCE 82 +#define SQL_STATIC_SENSITIVITY 83 +#define SQL_FILE_USAGE 84 +#define SQL_COLUMN_ALIAS 87 +#define SQL_GROUP_BY 88 +#define SQL_KEYWORDS 89 +#define SQL_OWNER_USAGE 91 +#define SQL_QUALIFIER_USAGE 92 +#define SQL_QUOTED_IDENTIFIER_CASE 93 +#define SQL_SUBQUERIES 95 +#define SQL_UNION 96 +#define SQL_MAX_ROW_SIZE_INCLUDES_LONG 103 +#define SQL_MAX_CHAR_LITERAL_LEN 108 +#define SQL_TIMEDATE_ADD_INTERVALS 109 +#define SQL_TIMEDATE_DIFF_INTERVALS 110 +#define SQL_NEED_LONG_DATA_LEN 111 +#define SQL_MAX_BINARY_LITERAL_LEN 112 +#define SQL_LIKE_ESCAPE_CLAUSE 113 +#define SQL_QUALIFIER_LOCATION 114 + +#if (ODBCVER >= 0x0201 && ODBCVER < 0x0300) +#ifndef SQL_OJ_CAPABILITIES +#define SQL_OJ_CAPABILITIES 65003 /* Temp value until ODBC 3.0 */ +#endif +#endif /* ODBCVER >= 0x0201 && ODBCVER < 0x0300 */ + +/*----------------------------------------------*/ +/* SQL_INFO_LAST and SQL_INFO_DRIVER_START are */ +/* not useful anymore, because X/Open has */ +/* values in the 10000 range. You */ +/* must contact X/Open directly to get a range */ +/* of numbers for driver-specific values. */ +/*----------------------------------------------*/ + +#if (ODBCVER < 0x0300) +#define SQL_INFO_LAST SQL_QUALIFIER_LOCATION +#define SQL_INFO_DRIVER_START 1000 +#endif /* ODBCVER < 0x0300 */ + +/*-----------------------------------------------*/ +/* ODBC 3.0 SQLGetInfo values that are not part */ +/* of the X/Open standard at this time. X/Open */ +/* standard values are in sql.h. */ +/*-----------------------------------------------*/ + +#if (ODBCVER >= 0x0300) +#define SQL_ACTIVE_ENVIRONMENTS 116 +#define SQL_ALTER_DOMAIN 117 + +#define SQL_SQL_CONFORMANCE 118 +#define SQL_DATETIME_LITERALS 119 + +#define SQL_ASYNC_MODE 10021 /* new X/Open spec */ +#define SQL_BATCH_ROW_COUNT 120 +#define SQL_BATCH_SUPPORT 121 +#define SQL_CATALOG_LOCATION SQL_QUALIFIER_LOCATION +#define SQL_CATALOG_NAME_SEPARATOR SQL_QUALIFIER_NAME_SEPARATOR +#define SQL_CATALOG_TERM SQL_QUALIFIER_TERM +#define SQL_CATALOG_USAGE SQL_QUALIFIER_USAGE +#define SQL_CONVERT_WCHAR 122 +#define SQL_CONVERT_INTERVAL_DAY_TIME 123 +#define SQL_CONVERT_INTERVAL_YEAR_MONTH 124 +#define SQL_CONVERT_WLONGVARCHAR 125 +#define SQL_CONVERT_WVARCHAR 126 +#define SQL_CREATE_ASSERTION 127 +#define SQL_CREATE_CHARACTER_SET 128 +#define SQL_CREATE_COLLATION 129 +#define SQL_CREATE_DOMAIN 130 +#define SQL_CREATE_SCHEMA 131 +#define SQL_CREATE_TABLE 132 +#define SQL_CREATE_TRANSLATION 133 +#define SQL_CREATE_VIEW 134 +#define SQL_DRIVER_HDESC 135 +#define SQL_DROP_ASSERTION 136 +#define SQL_DROP_CHARACTER_SET 137 +#define SQL_DROP_COLLATION 138 +#define SQL_DROP_DOMAIN 139 +#define SQL_DROP_SCHEMA 140 +#define SQL_DROP_TABLE 141 +#define SQL_DROP_TRANSLATION 142 +#define SQL_DROP_VIEW 143 +#define SQL_DYNAMIC_CURSOR_ATTRIBUTES1 144 +#define SQL_DYNAMIC_CURSOR_ATTRIBUTES2 145 +#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1 146 +#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 147 +#define SQL_INDEX_KEYWORDS 148 +#define SQL_INFO_SCHEMA_VIEWS 149 +#define SQL_KEYSET_CURSOR_ATTRIBUTES1 150 +#define SQL_KEYSET_CURSOR_ATTRIBUTES2 151 +#define SQL_MAX_ASYNC_CONCURRENT_STATEMENTS 10022 /* new X/Open spec */ +#define SQL_ODBC_INTERFACE_CONFORMANCE 152 +#define SQL_PARAM_ARRAY_ROW_COUNTS 153 +#define SQL_PARAM_ARRAY_SELECTS 154 +#define SQL_SCHEMA_TERM SQL_OWNER_TERM +#define SQL_SCHEMA_USAGE SQL_OWNER_USAGE +#define SQL_SQL92_DATETIME_FUNCTIONS 155 +#define SQL_SQL92_FOREIGN_KEY_DELETE_RULE 156 +#define SQL_SQL92_FOREIGN_KEY_UPDATE_RULE 157 +#define SQL_SQL92_GRANT 158 +#define SQL_SQL92_NUMERIC_VALUE_FUNCTIONS 159 +#define SQL_SQL92_PREDICATES 160 +#define SQL_SQL92_RELATIONAL_JOIN_OPERATORS 161 +#define SQL_SQL92_REVOKE 162 +#define SQL_SQL92_ROW_VALUE_CONSTRUCTOR 163 +#define SQL_SQL92_STRING_FUNCTIONS 164 +#define SQL_SQL92_VALUE_EXPRESSIONS 165 +#define SQL_STANDARD_CLI_CONFORMANCE 166 +#define SQL_STATIC_CURSOR_ATTRIBUTES1 167 +#define SQL_STATIC_CURSOR_ATTRIBUTES2 168 + +#define SQL_AGGREGATE_FUNCTIONS 169 +#define SQL_DDL_INDEX 170 +#define SQL_DM_VER 171 +#define SQL_INSERT_STATEMENT 172 +#define SQL_UNION_STATEMENT SQL_UNION +#endif /* ODBCVER >= 0x0300 */ + +#define SQL_DTC_TRANSITION_COST 1750 + +/* SQL_ALTER_TABLE bitmasks */ +#if (ODBCVER >= 0x0300) +/* the following 5 bitmasks are defined in sql.h +*#define SQL_AT_ADD_COLUMN 0x00000001L +*#define SQL_AT_DROP_COLUMN 0x00000002L +*#define SQL_AT_ADD_CONSTRAINT 0x00000008L +*/ +#define SQL_AT_ADD_COLUMN_SINGLE 0x00000020L +#define SQL_AT_ADD_COLUMN_DEFAULT 0x00000040L +#define SQL_AT_ADD_COLUMN_COLLATION 0x00000080L +#define SQL_AT_SET_COLUMN_DEFAULT 0x00000100L +#define SQL_AT_DROP_COLUMN_DEFAULT 0x00000200L +#define SQL_AT_DROP_COLUMN_CASCADE 0x00000400L +#define SQL_AT_DROP_COLUMN_RESTRICT 0x00000800L +#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L +#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L +#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L +#define SQL_AT_CONSTRAINT_NAME_DEFINITION 0x00008000L +#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED 0x00010000L +#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00020000L +#define SQL_AT_CONSTRAINT_DEFERRABLE 0x00040000L +#define SQL_AT_CONSTRAINT_NON_DEFERRABLE 0x00080000L +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_CONVERT_* return value bitmasks */ + +#define SQL_CVT_CHAR 0x00000001L +#define SQL_CVT_NUMERIC 0x00000002L +#define SQL_CVT_DECIMAL 0x00000004L +#define SQL_CVT_INTEGER 0x00000008L +#define SQL_CVT_SMALLINT 0x00000010L +#define SQL_CVT_FLOAT 0x00000020L +#define SQL_CVT_REAL 0x00000040L +#define SQL_CVT_DOUBLE 0x00000080L +#define SQL_CVT_VARCHAR 0x00000100L +#define SQL_CVT_LONGVARCHAR 0x00000200L +#define SQL_CVT_BINARY 0x00000400L +#define SQL_CVT_VARBINARY 0x00000800L +#define SQL_CVT_BIT 0x00001000L +#define SQL_CVT_TINYINT 0x00002000L +#define SQL_CVT_BIGINT 0x00004000L +#define SQL_CVT_DATE 0x00008000L +#define SQL_CVT_TIME 0x00010000L +#define SQL_CVT_TIMESTAMP 0x00020000L +#define SQL_CVT_LONGVARBINARY 0x00040000L +#if (ODBCVER >= 0x0300) +#define SQL_CVT_INTERVAL_YEAR_MONTH 0x00080000L +#define SQL_CVT_INTERVAL_DAY_TIME 0x00100000L +#define SQL_CVT_WCHAR 0x00200000L +#define SQL_CVT_WLONGVARCHAR 0x00400000L +#define SQL_CVT_WVARCHAR 0x00800000L +#define SQL_CVT_GUID 0x01000000L + +#endif /* ODBCVER >= 0x0300 */ + + +/* SQL_CONVERT_FUNCTIONS functions */ +#define SQL_FN_CVT_CONVERT 0x00000001L +#if (ODBCVER >= 0x0300) +#define SQL_FN_CVT_CAST 0x00000002L +#endif /* ODBCVER >= 0x0300 */ + + +/* SQL_STRING_FUNCTIONS functions */ + +#define SQL_FN_STR_CONCAT 0x00000001L +#define SQL_FN_STR_INSERT 0x00000002L +#define SQL_FN_STR_LEFT 0x00000004L +#define SQL_FN_STR_LTRIM 0x00000008L +#define SQL_FN_STR_LENGTH 0x00000010L +#define SQL_FN_STR_LOCATE 0x00000020L +#define SQL_FN_STR_LCASE 0x00000040L +#define SQL_FN_STR_REPEAT 0x00000080L +#define SQL_FN_STR_REPLACE 0x00000100L +#define SQL_FN_STR_RIGHT 0x00000200L +#define SQL_FN_STR_RTRIM 0x00000400L +#define SQL_FN_STR_SUBSTRING 0x00000800L +#define SQL_FN_STR_UCASE 0x00001000L +#define SQL_FN_STR_ASCII 0x00002000L +#define SQL_FN_STR_CHAR 0x00004000L +#define SQL_FN_STR_DIFFERENCE 0x00008000L +#define SQL_FN_STR_LOCATE_2 0x00010000L +#define SQL_FN_STR_SOUNDEX 0x00020000L +#define SQL_FN_STR_SPACE 0x00040000L +#if (ODBCVER >= 0x0300) +#define SQL_FN_STR_BIT_LENGTH 0x00080000L +#define SQL_FN_STR_CHAR_LENGTH 0x00100000L +#define SQL_FN_STR_CHARACTER_LENGTH 0x00200000L +#define SQL_FN_STR_OCTET_LENGTH 0x00400000L +#define SQL_FN_STR_POSITION 0x00800000L +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_SQL92_STRING_FUNCTIONS */ +#if (ODBCVER >= 0x0300) +#define SQL_SSF_CONVERT 0x00000001L +#define SQL_SSF_LOWER 0x00000002L +#define SQL_SSF_UPPER 0x00000004L +#define SQL_SSF_SUBSTRING 0x00000008L +#define SQL_SSF_TRANSLATE 0x00000010L +#define SQL_SSF_TRIM_BOTH 0x00000020L +#define SQL_SSF_TRIM_LEADING 0x00000040L +#define SQL_SSF_TRIM_TRAILING 0x00000080L +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_NUMERIC_FUNCTIONS functions */ + +#define SQL_FN_NUM_ABS 0x00000001L +#define SQL_FN_NUM_ACOS 0x00000002L +#define SQL_FN_NUM_ASIN 0x00000004L +#define SQL_FN_NUM_ATAN 0x00000008L +#define SQL_FN_NUM_ATAN2 0x00000010L +#define SQL_FN_NUM_CEILING 0x00000020L +#define SQL_FN_NUM_COS 0x00000040L +#define SQL_FN_NUM_COT 0x00000080L +#define SQL_FN_NUM_EXP 0x00000100L +#define SQL_FN_NUM_FLOOR 0x00000200L +#define SQL_FN_NUM_LOG 0x00000400L +#define SQL_FN_NUM_MOD 0x00000800L +#define SQL_FN_NUM_SIGN 0x00001000L +#define SQL_FN_NUM_SIN 0x00002000L +#define SQL_FN_NUM_SQRT 0x00004000L +#define SQL_FN_NUM_TAN 0x00008000L +#define SQL_FN_NUM_PI 0x00010000L +#define SQL_FN_NUM_RAND 0x00020000L +#define SQL_FN_NUM_DEGREES 0x00040000L +#define SQL_FN_NUM_LOG10 0x00080000L +#define SQL_FN_NUM_POWER 0x00100000L +#define SQL_FN_NUM_RADIANS 0x00200000L +#define SQL_FN_NUM_ROUND 0x00400000L +#define SQL_FN_NUM_TRUNCATE 0x00800000L + +/* SQL_SQL92_NUMERIC_VALUE_FUNCTIONS */ +#if (ODBCVER >= 0x0300) +#define SQL_SNVF_BIT_LENGTH 0x00000001L +#define SQL_SNVF_CHAR_LENGTH 0x00000002L +#define SQL_SNVF_CHARACTER_LENGTH 0x00000004L +#define SQL_SNVF_EXTRACT 0x00000008L +#define SQL_SNVF_OCTET_LENGTH 0x00000010L +#define SQL_SNVF_POSITION 0x00000020L +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_TIMEDATE_FUNCTIONS functions */ + +#define SQL_FN_TD_NOW 0x00000001L +#define SQL_FN_TD_CURDATE 0x00000002L +#define SQL_FN_TD_DAYOFMONTH 0x00000004L +#define SQL_FN_TD_DAYOFWEEK 0x00000008L +#define SQL_FN_TD_DAYOFYEAR 0x00000010L +#define SQL_FN_TD_MONTH 0x00000020L +#define SQL_FN_TD_QUARTER 0x00000040L +#define SQL_FN_TD_WEEK 0x00000080L +#define SQL_FN_TD_YEAR 0x00000100L +#define SQL_FN_TD_CURTIME 0x00000200L +#define SQL_FN_TD_HOUR 0x00000400L +#define SQL_FN_TD_MINUTE 0x00000800L +#define SQL_FN_TD_SECOND 0x00001000L +#define SQL_FN_TD_TIMESTAMPADD 0x00002000L +#define SQL_FN_TD_TIMESTAMPDIFF 0x00004000L +#define SQL_FN_TD_DAYNAME 0x00008000L +#define SQL_FN_TD_MONTHNAME 0x00010000L +#if (ODBCVER >= 0x0300) +#define SQL_FN_TD_CURRENT_DATE 0x00020000L +#define SQL_FN_TD_CURRENT_TIME 0x00040000L +#define SQL_FN_TD_CURRENT_TIMESTAMP 0x00080000L +#define SQL_FN_TD_EXTRACT 0x00100000L +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_SQL92_DATETIME_FUNCTIONS */ +#if (ODBCVER >= 0x0300) +#define SQL_SDF_CURRENT_DATE 0x00000001L +#define SQL_SDF_CURRENT_TIME 0x00000002L +#define SQL_SDF_CURRENT_TIMESTAMP 0x00000004L +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_SYSTEM_FUNCTIONS functions */ + +#define SQL_FN_SYS_USERNAME 0x00000001L +#define SQL_FN_SYS_DBNAME 0x00000002L +#define SQL_FN_SYS_IFNULL 0x00000004L + +/* SQL_TIMEDATE_ADD_INTERVALS and SQL_TIMEDATE_DIFF_INTERVALS functions */ + +#define SQL_FN_TSI_FRAC_SECOND 0x00000001L +#define SQL_FN_TSI_SECOND 0x00000002L +#define SQL_FN_TSI_MINUTE 0x00000004L +#define SQL_FN_TSI_HOUR 0x00000008L +#define SQL_FN_TSI_DAY 0x00000010L +#define SQL_FN_TSI_WEEK 0x00000020L +#define SQL_FN_TSI_MONTH 0x00000040L +#define SQL_FN_TSI_QUARTER 0x00000080L +#define SQL_FN_TSI_YEAR 0x00000100L + +/* bitmasks for SQL_DYNAMIC_CURSOR_ATTRIBUTES1, + * SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1, + * SQL_KEYSET_CURSOR_ATTRIBUTES1, and SQL_STATIC_CURSOR_ATTRIBUTES1 + */ +#if (ODBCVER >= 0x0300) +/* supported SQLFetchScroll FetchOrientation's */ +#define SQL_CA1_NEXT 0x00000001L +#define SQL_CA1_ABSOLUTE 0x00000002L +#define SQL_CA1_RELATIVE 0x00000004L +#define SQL_CA1_BOOKMARK 0x00000008L + +/* supported SQLSetPos LockType's */ +#define SQL_CA1_LOCK_NO_CHANGE 0x00000040L +#define SQL_CA1_LOCK_EXCLUSIVE 0x00000080L +#define SQL_CA1_LOCK_UNLOCK 0x00000100L + +/* supported SQLSetPos Operations */ +#define SQL_CA1_POS_POSITION 0x00000200L +#define SQL_CA1_POS_UPDATE 0x00000400L +#define SQL_CA1_POS_DELETE 0x00000800L +#define SQL_CA1_POS_REFRESH 0x00001000L + +/* positioned updates and deletes */ +#define SQL_CA1_POSITIONED_UPDATE 0x00002000L +#define SQL_CA1_POSITIONED_DELETE 0x00004000L +#define SQL_CA1_SELECT_FOR_UPDATE 0x00008000L + +/* supported SQLBulkOperations operations */ +#define SQL_CA1_BULK_ADD 0x00010000L +#define SQL_CA1_BULK_UPDATE_BY_BOOKMARK 0x00020000L +#define SQL_CA1_BULK_DELETE_BY_BOOKMARK 0x00040000L +#define SQL_CA1_BULK_FETCH_BY_BOOKMARK 0x00080000L +#endif /* ODBCVER >= 0x0300 */ + +/* bitmasks for SQL_DYNAMIC_CURSOR_ATTRIBUTES2, + * SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2, + * SQL_KEYSET_CURSOR_ATTRIBUTES2, and SQL_STATIC_CURSOR_ATTRIBUTES2 + */ +#if (ODBCVER >= 0x0300) +/* supported values for SQL_ATTR_SCROLL_CONCURRENCY */ +#define SQL_CA2_READ_ONLY_CONCURRENCY 0x00000001L +#define SQL_CA2_LOCK_CONCURRENCY 0x00000002L +#define SQL_CA2_OPT_ROWVER_CONCURRENCY 0x00000004L +#define SQL_CA2_OPT_VALUES_CONCURRENCY 0x00000008L + +/* sensitivity of the cursor to its own inserts, deletes, and updates */ +#define SQL_CA2_SENSITIVITY_ADDITIONS 0x00000010L +#define SQL_CA2_SENSITIVITY_DELETIONS 0x00000020L +#define SQL_CA2_SENSITIVITY_UPDATES 0x00000040L + +/* semantics of SQL_ATTR_MAX_ROWS */ +#define SQL_CA2_MAX_ROWS_SELECT 0x00000080L +#define SQL_CA2_MAX_ROWS_INSERT 0x00000100L +#define SQL_CA2_MAX_ROWS_DELETE 0x00000200L +#define SQL_CA2_MAX_ROWS_UPDATE 0x00000400L +#define SQL_CA2_MAX_ROWS_CATALOG 0x00000800L +#define SQL_CA2_MAX_ROWS_AFFECTS_ALL (SQL_CA2_MAX_ROWS_SELECT | SQL_CA2_MAX_ROWS_INSERT | SQL_CA2_MAX_ROWS_DELETE | SQL_CA2_MAX_ROWS_UPDATE | SQL_CA2_MAX_ROWS_CATALOG) + +/* semantics of SQL_DIAG_CURSOR_ROW_COUNT */ +#define SQL_CA2_CRC_EXACT 0x00001000L +#define SQL_CA2_CRC_APPROXIMATE 0x00002000L + +/* the kinds of positioned statements that can be simulated */ +#define SQL_CA2_SIMULATE_NON_UNIQUE 0x00004000L +#define SQL_CA2_SIMULATE_TRY_UNIQUE 0x00008000L +#define SQL_CA2_SIMULATE_UNIQUE 0x00010000L +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_ODBC_API_CONFORMANCE values */ + +#define SQL_OAC_NONE 0x0000 +#define SQL_OAC_LEVEL1 0x0001 +#define SQL_OAC_LEVEL2 0x0002 + +/* SQL_ODBC_SAG_CLI_CONFORMANCE values */ + +#define SQL_OSCC_NOT_COMPLIANT 0x0000 +#define SQL_OSCC_COMPLIANT 0x0001 + +/* SQL_ODBC_SQL_CONFORMANCE values */ + +#define SQL_OSC_MINIMUM 0x0000 +#define SQL_OSC_CORE 0x0001 +#define SQL_OSC_EXTENDED 0x0002 + + +/* SQL_CONCAT_NULL_BEHAVIOR values */ + +#define SQL_CB_NULL 0x0000 +#define SQL_CB_NON_NULL 0x0001 + +/* SQL_SCROLL_OPTIONS masks */ + +#define SQL_SO_FORWARD_ONLY 0x00000001L +#define SQL_SO_KEYSET_DRIVEN 0x00000002L +#define SQL_SO_DYNAMIC 0x00000004L +#define SQL_SO_MIXED 0x00000008L +#define SQL_SO_STATIC 0x00000010L + +/* SQL_FETCH_DIRECTION masks */ + +/* SQL_FETCH_RESUME is no longer supported +#define SQL_FD_FETCH_RESUME 0x00000040L +*/ +#define SQL_FD_FETCH_BOOKMARK 0x00000080L + +/* SQL_TXN_ISOLATION_OPTION masks */ +/* SQL_TXN_VERSIONING is no longer supported +#define SQL_TXN_VERSIONING 0x00000010L +*/ + +/* SQL_CORRELATION_NAME values */ + +#define SQL_CN_NONE 0x0000 +#define SQL_CN_DIFFERENT 0x0001 +#define SQL_CN_ANY 0x0002 + +/* SQL_NON_NULLABLE_COLUMNS values */ + +#define SQL_NNC_NULL 0x0000 +#define SQL_NNC_NON_NULL 0x0001 + +/* SQL_NULL_COLLATION values */ + +#define SQL_NC_START 0x0002 +#define SQL_NC_END 0x0004 + +/* SQL_FILE_USAGE values */ + +#define SQL_FILE_NOT_SUPPORTED 0x0000 +#define SQL_FILE_TABLE 0x0001 +#define SQL_FILE_QUALIFIER 0x0002 +#define SQL_FILE_CATALOG SQL_FILE_QUALIFIER /* ODBC 3.0 */ + + +/* SQL_GETDATA_EXTENSIONS values */ + +#define SQL_GD_BLOCK 0x00000004L +#define SQL_GD_BOUND 0x00000008L + +/* SQL_POSITIONED_STATEMENTS masks */ + +#define SQL_PS_POSITIONED_DELETE 0x00000001L +#define SQL_PS_POSITIONED_UPDATE 0x00000002L +#define SQL_PS_SELECT_FOR_UPDATE 0x00000004L + +/* SQL_GROUP_BY values */ + +#define SQL_GB_NOT_SUPPORTED 0x0000 +#define SQL_GB_GROUP_BY_EQUALS_SELECT 0x0001 +#define SQL_GB_GROUP_BY_CONTAINS_SELECT 0x0002 +#define SQL_GB_NO_RELATION 0x0003 +#if (ODBCVER >= 0x0300) +#define SQL_GB_COLLATE 0x0004 + +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_OWNER_USAGE masks */ + +#define SQL_OU_DML_STATEMENTS 0x00000001L +#define SQL_OU_PROCEDURE_INVOCATION 0x00000002L +#define SQL_OU_TABLE_DEFINITION 0x00000004L +#define SQL_OU_INDEX_DEFINITION 0x00000008L +#define SQL_OU_PRIVILEGE_DEFINITION 0x00000010L + +/* SQL_SCHEMA_USAGE masks */ +#if (ODBCVER >= 0x0300) +#define SQL_SU_DML_STATEMENTS SQL_OU_DML_STATEMENTS +#define SQL_SU_PROCEDURE_INVOCATION SQL_OU_PROCEDURE_INVOCATION +#define SQL_SU_TABLE_DEFINITION SQL_OU_TABLE_DEFINITION +#define SQL_SU_INDEX_DEFINITION SQL_OU_INDEX_DEFINITION +#define SQL_SU_PRIVILEGE_DEFINITION SQL_OU_PRIVILEGE_DEFINITION +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_QUALIFIER_USAGE masks */ + +#define SQL_QU_DML_STATEMENTS 0x00000001L +#define SQL_QU_PROCEDURE_INVOCATION 0x00000002L +#define SQL_QU_TABLE_DEFINITION 0x00000004L +#define SQL_QU_INDEX_DEFINITION 0x00000008L +#define SQL_QU_PRIVILEGE_DEFINITION 0x00000010L + +#if (ODBCVER >= 0x0300) +/* SQL_CATALOG_USAGE masks */ +#define SQL_CU_DML_STATEMENTS SQL_QU_DML_STATEMENTS +#define SQL_CU_PROCEDURE_INVOCATION SQL_QU_PROCEDURE_INVOCATION +#define SQL_CU_TABLE_DEFINITION SQL_QU_TABLE_DEFINITION +#define SQL_CU_INDEX_DEFINITION SQL_QU_INDEX_DEFINITION +#define SQL_CU_PRIVILEGE_DEFINITION SQL_QU_PRIVILEGE_DEFINITION +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_SUBQUERIES masks */ + +#define SQL_SQ_COMPARISON 0x00000001L +#define SQL_SQ_EXISTS 0x00000002L +#define SQL_SQ_IN 0x00000004L +#define SQL_SQ_QUANTIFIED 0x00000008L +#define SQL_SQ_CORRELATED_SUBQUERIES 0x00000010L + +/* SQL_UNION masks */ + +#define SQL_U_UNION 0x00000001L +#define SQL_U_UNION_ALL 0x00000002L + +/* SQL_BOOKMARK_PERSISTENCE values */ + +#define SQL_BP_CLOSE 0x00000001L +#define SQL_BP_DELETE 0x00000002L +#define SQL_BP_DROP 0x00000004L +#define SQL_BP_TRANSACTION 0x00000008L +#define SQL_BP_UPDATE 0x00000010L +#define SQL_BP_OTHER_HSTMT 0x00000020L +#define SQL_BP_SCROLL 0x00000040L + +/* SQL_STATIC_SENSITIVITY values */ + +#define SQL_SS_ADDITIONS 0x00000001L +#define SQL_SS_DELETIONS 0x00000002L +#define SQL_SS_UPDATES 0x00000004L + +/* SQL_VIEW values */ +#define SQL_CV_CREATE_VIEW 0x00000001L +#define SQL_CV_CHECK_OPTION 0x00000002L +#define SQL_CV_CASCADED 0x00000004L +#define SQL_CV_LOCAL 0x00000008L + +/* SQL_LOCK_TYPES masks */ + +#define SQL_LCK_NO_CHANGE 0x00000001L +#define SQL_LCK_EXCLUSIVE 0x00000002L +#define SQL_LCK_UNLOCK 0x00000004L + +/* SQL_POS_OPERATIONS masks */ + +#define SQL_POS_POSITION 0x00000001L +#define SQL_POS_REFRESH 0x00000002L +#define SQL_POS_UPDATE 0x00000004L +#define SQL_POS_DELETE 0x00000008L +#define SQL_POS_ADD 0x00000010L + +/* SQL_QUALIFIER_LOCATION values */ + +#define SQL_QL_START 0x0001 +#define SQL_QL_END 0x0002 + +/* Here start return values for ODBC 3.0 SQLGetInfo */ + +#if (ODBCVER >= 0x0300) +/* SQL_AGGREGATE_FUNCTIONS bitmasks */ +#define SQL_AF_AVG 0x00000001L +#define SQL_AF_COUNT 0x00000002L +#define SQL_AF_MAX 0x00000004L +#define SQL_AF_MIN 0x00000008L +#define SQL_AF_SUM 0x00000010L +#define SQL_AF_DISTINCT 0x00000020L +#define SQL_AF_ALL 0x00000040L + +/* SQL_SQL_CONFORMANCE bit masks */ +#define SQL_SC_SQL92_ENTRY 0x00000001L +#define SQL_SC_FIPS127_2_TRANSITIONAL 0x00000002L +#define SQL_SC_SQL92_INTERMEDIATE 0x00000004L +#define SQL_SC_SQL92_FULL 0x00000008L + +/* SQL_DATETIME_LITERALS masks */ +#define SQL_DL_SQL92_DATE 0x00000001L +#define SQL_DL_SQL92_TIME 0x00000002L +#define SQL_DL_SQL92_TIMESTAMP 0x00000004L +#define SQL_DL_SQL92_INTERVAL_YEAR 0x00000008L +#define SQL_DL_SQL92_INTERVAL_MONTH 0x00000010L +#define SQL_DL_SQL92_INTERVAL_DAY 0x00000020L +#define SQL_DL_SQL92_INTERVAL_HOUR 0x00000040L +#define SQL_DL_SQL92_INTERVAL_MINUTE 0x00000080L +#define SQL_DL_SQL92_INTERVAL_SECOND 0x00000100L +#define SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH 0x00000200L +#define SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR 0x00000400L +#define SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE 0x00000800L +#define SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND 0x00001000L +#define SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE 0x00002000L +#define SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND 0x00004000L +#define SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND 0x00008000L + +/* SQL_CATALOG_LOCATION values */ +#define SQL_CL_START SQL_QL_START +#define SQL_CL_END SQL_QL_END + +/* values for SQL_BATCH_ROW_COUNT */ +#define SQL_BRC_PROCEDURES 0x0000001 +#define SQL_BRC_EXPLICIT 0x0000002 +#define SQL_BRC_ROLLED_UP 0x0000004 + +/* bitmasks for SQL_BATCH_SUPPORT */ +#define SQL_BS_SELECT_EXPLICIT 0x00000001L +#define SQL_BS_ROW_COUNT_EXPLICIT 0x00000002L +#define SQL_BS_SELECT_PROC 0x00000004L +#define SQL_BS_ROW_COUNT_PROC 0x00000008L + +/* Values for SQL_PARAM_ARRAY_ROW_COUNTS getinfo */ +#define SQL_PARC_BATCH 1 +#define SQL_PARC_NO_BATCH 2 + +/* values for SQL_PARAM_ARRAY_SELECTS */ +#define SQL_PAS_BATCH 1 +#define SQL_PAS_NO_BATCH 2 +#define SQL_PAS_NO_SELECT 3 + +/* Bitmasks for SQL_INDEX_KEYWORDS */ +#define SQL_IK_NONE 0x00000000L +#define SQL_IK_ASC 0x00000001L +#define SQL_IK_DESC 0x00000002L +#define SQL_IK_ALL (SQL_IK_ASC | SQL_IK_DESC) + +/* Bitmasks for SQL_INFO_SCHEMA_VIEWS */ + +#define SQL_ISV_ASSERTIONS 0x00000001L +#define SQL_ISV_CHARACTER_SETS 0x00000002L +#define SQL_ISV_CHECK_CONSTRAINTS 0x00000004L +#define SQL_ISV_COLLATIONS 0x00000008L +#define SQL_ISV_COLUMN_DOMAIN_USAGE 0x00000010L +#define SQL_ISV_COLUMN_PRIVILEGES 0x00000020L +#define SQL_ISV_COLUMNS 0x00000040L +#define SQL_ISV_CONSTRAINT_COLUMN_USAGE 0x00000080L +#define SQL_ISV_CONSTRAINT_TABLE_USAGE 0x00000100L +#define SQL_ISV_DOMAIN_CONSTRAINTS 0x00000200L +#define SQL_ISV_DOMAINS 0x00000400L +#define SQL_ISV_KEY_COLUMN_USAGE 0x00000800L +#define SQL_ISV_REFERENTIAL_CONSTRAINTS 0x00001000L +#define SQL_ISV_SCHEMATA 0x00002000L +#define SQL_ISV_SQL_LANGUAGES 0x00004000L +#define SQL_ISV_TABLE_CONSTRAINTS 0x00008000L +#define SQL_ISV_TABLE_PRIVILEGES 0x00010000L +#define SQL_ISV_TABLES 0x00020000L +#define SQL_ISV_TRANSLATIONS 0x00040000L +#define SQL_ISV_USAGE_PRIVILEGES 0x00080000L +#define SQL_ISV_VIEW_COLUMN_USAGE 0x00100000L +#define SQL_ISV_VIEW_TABLE_USAGE 0x00200000L +#define SQL_ISV_VIEWS 0x00400000L + +/* Bitmasks for SQL_ASYNC_MODE */ + +#define SQL_AM_NONE 0 +#define SQL_AM_CONNECTION 1 +#define SQL_AM_STATEMENT 2 + +/* Bitmasks for SQL_ALTER_DOMAIN */ +#define SQL_AD_CONSTRAINT_NAME_DEFINITION 0x00000001L +#define SQL_AD_ADD_DOMAIN_CONSTRAINT 0x00000002L +#define SQL_AD_DROP_DOMAIN_CONSTRAINT 0x00000004L +#define SQL_AD_ADD_DOMAIN_DEFAULT 0x00000008L +#define SQL_AD_DROP_DOMAIN_DEFAULT 0x00000010L +#define SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L +#define SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L +#define SQL_AD_ADD_CONSTRAINT_DEFERRABLE 0x00000080L +#define SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE 0x00000100L + + +/* SQL_CREATE_SCHEMA bitmasks */ +#define SQL_CS_CREATE_SCHEMA 0x00000001L +#define SQL_CS_AUTHORIZATION 0x00000002L +#define SQL_CS_DEFAULT_CHARACTER_SET 0x00000004L + +/* SQL_CREATE_TRANSLATION bitmasks */ +#define SQL_CTR_CREATE_TRANSLATION 0x00000001L + +/* SQL_CREATE_ASSERTION bitmasks */ +#define SQL_CA_CREATE_ASSERTION 0x00000001L +#define SQL_CA_CONSTRAINT_INITIALLY_DEFERRED 0x00000010L +#define SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000020L +#define SQL_CA_CONSTRAINT_DEFERRABLE 0x00000040L +#define SQL_CA_CONSTRAINT_NON_DEFERRABLE 0x00000080L + +/* SQL_CREATE_CHARACTER_SET bitmasks */ +#define SQL_CCS_CREATE_CHARACTER_SET 0x00000001L +#define SQL_CCS_COLLATE_CLAUSE 0x00000002L +#define SQL_CCS_LIMITED_COLLATION 0x00000004L + +/* SQL_CREATE_COLLATION bitmasks */ +#define SQL_CCOL_CREATE_COLLATION 0x00000001L + +/* SQL_CREATE_DOMAIN bitmasks */ +#define SQL_CDO_CREATE_DOMAIN 0x00000001L +#define SQL_CDO_DEFAULT 0x00000002L +#define SQL_CDO_CONSTRAINT 0x00000004L +#define SQL_CDO_COLLATION 0x00000008L +#define SQL_CDO_CONSTRAINT_NAME_DEFINITION 0x00000010L +#define SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L +#define SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L +#define SQL_CDO_CONSTRAINT_DEFERRABLE 0x00000080L +#define SQL_CDO_CONSTRAINT_NON_DEFERRABLE 0x00000100L + +/* SQL_CREATE_TABLE bitmasks */ +#define SQL_CT_CREATE_TABLE 0x00000001L +#define SQL_CT_COMMIT_PRESERVE 0x00000002L +#define SQL_CT_COMMIT_DELETE 0x00000004L +#define SQL_CT_GLOBAL_TEMPORARY 0x00000008L +#define SQL_CT_LOCAL_TEMPORARY 0x00000010L +#define SQL_CT_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L +#define SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L +#define SQL_CT_CONSTRAINT_DEFERRABLE 0x00000080L +#define SQL_CT_CONSTRAINT_NON_DEFERRABLE 0x00000100L +#define SQL_CT_COLUMN_CONSTRAINT 0x00000200L +#define SQL_CT_COLUMN_DEFAULT 0x00000400L +#define SQL_CT_COLUMN_COLLATION 0x00000800L +#define SQL_CT_TABLE_CONSTRAINT 0x00001000L +#define SQL_CT_CONSTRAINT_NAME_DEFINITION 0x00002000L + +/* SQL_DDL_INDEX bitmasks */ +#define SQL_DI_CREATE_INDEX 0x00000001L +#define SQL_DI_DROP_INDEX 0x00000002L + +/* SQL_DROP_COLLATION bitmasks */ +#define SQL_DC_DROP_COLLATION 0x00000001L + +/* SQL_DROP_DOMAIN bitmasks */ +#define SQL_DD_DROP_DOMAIN 0x00000001L +#define SQL_DD_RESTRICT 0x00000002L +#define SQL_DD_CASCADE 0x00000004L + +/* SQL_DROP_SCHEMA bitmasks */ +#define SQL_DS_DROP_SCHEMA 0x00000001L +#define SQL_DS_RESTRICT 0x00000002L +#define SQL_DS_CASCADE 0x00000004L + +/* SQL_DROP_CHARACTER_SET bitmasks */ +#define SQL_DCS_DROP_CHARACTER_SET 0x00000001L + +/* SQL_DROP_ASSERTION bitmasks */ +#define SQL_DA_DROP_ASSERTION 0x00000001L + +/* SQL_DROP_TABLE bitmasks */ +#define SQL_DT_DROP_TABLE 0x00000001L +#define SQL_DT_RESTRICT 0x00000002L +#define SQL_DT_CASCADE 0x00000004L + +/* SQL_DROP_TRANSLATION bitmasks */ +#define SQL_DTR_DROP_TRANSLATION 0x00000001L + +/* SQL_DROP_VIEW bitmasks */ +#define SQL_DV_DROP_VIEW 0x00000001L +#define SQL_DV_RESTRICT 0x00000002L +#define SQL_DV_CASCADE 0x00000004L + +/* SQL_INSERT_STATEMENT bitmasks */ +#define SQL_IS_INSERT_LITERALS 0x00000001L +#define SQL_IS_INSERT_SEARCHED 0x00000002L +#define SQL_IS_SELECT_INTO 0x00000004L + +/* SQL_ODBC_INTERFACE_CONFORMANCE values */ +#define SQL_OIC_CORE 1UL +#define SQL_OIC_LEVEL1 2UL +#define SQL_OIC_LEVEL2 3UL + +/* SQL_SQL92_FOREIGN_KEY_DELETE_RULE bitmasks */ +#define SQL_SFKD_CASCADE 0x00000001L +#define SQL_SFKD_NO_ACTION 0x00000002L +#define SQL_SFKD_SET_DEFAULT 0x00000004L +#define SQL_SFKD_SET_NULL 0x00000008L + +/* SQL_SQL92_FOREIGN_KEY_UPDATE_RULE bitmasks */ +#define SQL_SFKU_CASCADE 0x00000001L +#define SQL_SFKU_NO_ACTION 0x00000002L +#define SQL_SFKU_SET_DEFAULT 0x00000004L +#define SQL_SFKU_SET_NULL 0x00000008L + +/* SQL_SQL92_GRANT bitmasks */ +#define SQL_SG_USAGE_ON_DOMAIN 0x00000001L +#define SQL_SG_USAGE_ON_CHARACTER_SET 0x00000002L +#define SQL_SG_USAGE_ON_COLLATION 0x00000004L +#define SQL_SG_USAGE_ON_TRANSLATION 0x00000008L +#define SQL_SG_WITH_GRANT_OPTION 0x00000010L +#define SQL_SG_DELETE_TABLE 0x00000020L +#define SQL_SG_INSERT_TABLE 0x00000040L +#define SQL_SG_INSERT_COLUMN 0x00000080L +#define SQL_SG_REFERENCES_TABLE 0x00000100L +#define SQL_SG_REFERENCES_COLUMN 0x00000200L +#define SQL_SG_SELECT_TABLE 0x00000400L +#define SQL_SG_UPDATE_TABLE 0x00000800L +#define SQL_SG_UPDATE_COLUMN 0x00001000L + +/* SQL_SQL92_PREDICATES bitmasks */ +#define SQL_SP_EXISTS 0x00000001L +#define SQL_SP_ISNOTNULL 0x00000002L +#define SQL_SP_ISNULL 0x00000004L +#define SQL_SP_MATCH_FULL 0x00000008L +#define SQL_SP_MATCH_PARTIAL 0x00000010L +#define SQL_SP_MATCH_UNIQUE_FULL 0x00000020L +#define SQL_SP_MATCH_UNIQUE_PARTIAL 0x00000040L +#define SQL_SP_OVERLAPS 0x00000080L +#define SQL_SP_UNIQUE 0x00000100L +#define SQL_SP_LIKE 0x00000200L +#define SQL_SP_IN 0x00000400L +#define SQL_SP_BETWEEN 0x00000800L +#define SQL_SP_COMPARISON 0x00001000L +#define SQL_SP_QUANTIFIED_COMPARISON 0x00002000L + +/* SQL_SQL92_RELATIONAL_JOIN_OPERATORS bitmasks */ +#define SQL_SRJO_CORRESPONDING_CLAUSE 0x00000001L +#define SQL_SRJO_CROSS_JOIN 0x00000002L +#define SQL_SRJO_EXCEPT_JOIN 0x00000004L +#define SQL_SRJO_FULL_OUTER_JOIN 0x00000008L +#define SQL_SRJO_INNER_JOIN 0x00000010L +#define SQL_SRJO_INTERSECT_JOIN 0x00000020L +#define SQL_SRJO_LEFT_OUTER_JOIN 0x00000040L +#define SQL_SRJO_NATURAL_JOIN 0x00000080L +#define SQL_SRJO_RIGHT_OUTER_JOIN 0x00000100L +#define SQL_SRJO_UNION_JOIN 0x00000200L + +/* SQL_SQL92_REVOKE bitmasks */ +#define SQL_SR_USAGE_ON_DOMAIN 0x00000001L +#define SQL_SR_USAGE_ON_CHARACTER_SET 0x00000002L +#define SQL_SR_USAGE_ON_COLLATION 0x00000004L +#define SQL_SR_USAGE_ON_TRANSLATION 0x00000008L +#define SQL_SR_GRANT_OPTION_FOR 0x00000010L +#define SQL_SR_CASCADE 0x00000020L +#define SQL_SR_RESTRICT 0x00000040L +#define SQL_SR_DELETE_TABLE 0x00000080L +#define SQL_SR_INSERT_TABLE 0x00000100L +#define SQL_SR_INSERT_COLUMN 0x00000200L +#define SQL_SR_REFERENCES_TABLE 0x00000400L +#define SQL_SR_REFERENCES_COLUMN 0x00000800L +#define SQL_SR_SELECT_TABLE 0x00001000L +#define SQL_SR_UPDATE_TABLE 0x00002000L +#define SQL_SR_UPDATE_COLUMN 0x00004000L + +/* SQL_SQL92_ROW_VALUE_CONSTRUCTOR bitmasks */ +#define SQL_SRVC_VALUE_EXPRESSION 0x00000001L +#define SQL_SRVC_NULL 0x00000002L +#define SQL_SRVC_DEFAULT 0x00000004L +#define SQL_SRVC_ROW_SUBQUERY 0x00000008L + +/* SQL_SQL92_VALUE_EXPRESSIONS bitmasks */ +#define SQL_SVE_CASE 0x00000001L +#define SQL_SVE_CAST 0x00000002L +#define SQL_SVE_COALESCE 0x00000004L +#define SQL_SVE_NULLIF 0x00000008L + +/* SQL_STANDARD_CLI_CONFORMANCE bitmasks */ +#define SQL_SCC_XOPEN_CLI_VERSION1 0x00000001L +#define SQL_SCC_ISO92_CLI 0x00000002L + +/* SQL_UNION_STATEMENT bitmasks */ +#define SQL_US_UNION SQL_U_UNION +#define SQL_US_UNION_ALL SQL_U_UNION_ALL + +#endif /* ODBCVER >= 0x0300 */ + +/* SQL_DTC_TRANSITION_COST bitmasks */ +#define SQL_DTC_ENLIST_EXPENSIVE 0x00000001L +#define SQL_DTC_UNENLIST_EXPENSIVE 0x00000002L + +/* additional SQLDataSources fetch directions */ +#if (ODBCVER >= 0x0300) +#define SQL_FETCH_FIRST_USER 31 +#define SQL_FETCH_FIRST_SYSTEM 32 +#endif /* ODBCVER >= 0x0300 */ + + +/* Defines for SQLSetPos */ +#define SQL_ENTIRE_ROWSET 0 + +/* Operations in SQLSetPos */ +#define SQL_POSITION 0 /* 1.0 FALSE */ +#define SQL_REFRESH 1 /* 1.0 TRUE */ +#define SQL_UPDATE 2 +#define SQL_DELETE 3 + +/* Operations in SQLBulkOperations */ +#define SQL_ADD 4 +#define SQL_SETPOS_MAX_OPTION_VALUE SQL_ADD +#if (ODBCVER >= 0x0300) +#define SQL_UPDATE_BY_BOOKMARK 5 +#define SQL_DELETE_BY_BOOKMARK 6 +#define SQL_FETCH_BY_BOOKMARK 7 + +#endif /* ODBCVER >= 0x0300 */ + +/* Lock options in SQLSetPos */ +#define SQL_LOCK_NO_CHANGE 0 /* 1.0 FALSE */ +#define SQL_LOCK_EXCLUSIVE 1 /* 1.0 TRUE */ +#define SQL_LOCK_UNLOCK 2 + +#define SQL_SETPOS_MAX_LOCK_VALUE SQL_LOCK_UNLOCK + +/* Macros for SQLSetPos */ +#define SQL_POSITION_TO(hstmt,irow) SQLSetPos(hstmt,irow,SQL_POSITION,SQL_LOCK_NO_CHANGE) +#define SQL_LOCK_RECORD(hstmt,irow,fLock) SQLSetPos(hstmt,irow,SQL_POSITION,fLock) +#define SQL_REFRESH_RECORD(hstmt,irow,fLock) SQLSetPos(hstmt,irow,SQL_REFRESH,fLock) +#define SQL_UPDATE_RECORD(hstmt,irow) SQLSetPos(hstmt,irow,SQL_UPDATE,SQL_LOCK_NO_CHANGE) +#define SQL_DELETE_RECORD(hstmt,irow) SQLSetPos(hstmt,irow,SQL_DELETE,SQL_LOCK_NO_CHANGE) +#define SQL_ADD_RECORD(hstmt,irow) SQLSetPos(hstmt,irow,SQL_ADD,SQL_LOCK_NO_CHANGE) + +/* Column types and scopes in SQLSpecialColumns. */ +#define SQL_BEST_ROWID 1 +#define SQL_ROWVER 2 + +/* Defines for SQLSpecialColumns (returned in the result set) + SQL_PC_UNKNOWN and SQL_PC_PSEUDO are defined in sql.h */ +#define SQL_PC_NOT_PSEUDO 1 + +/* Defines for SQLStatistics */ +#define SQL_QUICK 0 +#define SQL_ENSURE 1 + +/* Defines for SQLStatistics (returned in the result set) + SQL_INDEX_CLUSTERED, SQL_INDEX_HASHED, and SQL_INDEX_OTHER are + defined in sql.h */ +#define SQL_TABLE_STAT 0 + + +/* Defines for SQLTables */ +#if (ODBCVER >= 0x0300) +#define SQL_ALL_CATALOGS "%" +#define SQL_ALL_SCHEMAS "%" +#define SQL_ALL_TABLE_TYPES "%" +#endif /* ODBCVER >= 0x0300 */ + +/* Options for SQLDriverConnect */ +#define SQL_DRIVER_NOPROMPT 0 +#define SQL_DRIVER_COMPLETE 1 +#define SQL_DRIVER_PROMPT 2 +#define SQL_DRIVER_COMPLETE_REQUIRED 3 + +SQLRETURN SQL_API SQLDriverConnect( + SQLHDBC hdbc, + SQLHWND hwnd, + SQLCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut, + SQLUSMALLINT fDriverCompletion); + +/* Level 2 Functions */ + +/* SQLExtendedFetch "fFetchType" values */ +#define SQL_FETCH_BOOKMARK 8 + +/* SQLExtendedFetch "rgfRowStatus" element values */ +#define SQL_ROW_SUCCESS 0 +#define SQL_ROW_DELETED 1 +#define SQL_ROW_UPDATED 2 +#define SQL_ROW_NOROW 3 +#define SQL_ROW_ADDED 4 +#define SQL_ROW_ERROR 5 +#if (ODBCVER >= 0x0300) +#define SQL_ROW_SUCCESS_WITH_INFO 6 +#define SQL_ROW_PROCEED 0 +#define SQL_ROW_IGNORE 1 +#endif + +/* value for SQL_DESC_ARRAY_STATUS_PTR */ +#if (ODBCVER >= 0x0300) +#define SQL_PARAM_SUCCESS 0 +#define SQL_PARAM_SUCCESS_WITH_INFO 6 +#define SQL_PARAM_ERROR 5 +#define SQL_PARAM_UNUSED 7 +#define SQL_PARAM_DIAG_UNAVAILABLE 1 + +#define SQL_PARAM_PROCEED 0 +#define SQL_PARAM_IGNORE 1 +#endif /* ODBCVER >= 0x0300 */ + +/* Defines for SQLForeignKeys (UPDATE_RULE and DELETE_RULE) */ +#define SQL_CASCADE 0 +#define SQL_RESTRICT 1 +#define SQL_SET_NULL 2 +#if (ODBCVER >= 0x0250) +#define SQL_NO_ACTION 3 +#define SQL_SET_DEFAULT 4 +#endif /* ODBCVER >= 0x0250 */ + +#if (ODBCVER >= 0x0300) +/* Note that the following are in a different column of SQLForeignKeys than */ +/* the previous #defines. These are for DEFERRABILITY. */ + +#define SQL_INITIALLY_DEFERRED 5 +#define SQL_INITIALLY_IMMEDIATE 6 +#define SQL_NOT_DEFERRABLE 7 + +#endif /* ODBCVER >= 0x0300 */ + +/* Defines for SQLBindParameter and + SQLProcedureColumns (returned in the result set) */ +#define SQL_PARAM_TYPE_UNKNOWN 0 +#define SQL_PARAM_INPUT 1 +#define SQL_PARAM_INPUT_OUTPUT 2 +#define SQL_RESULT_COL 3 +#define SQL_PARAM_OUTPUT 4 +#define SQL_RETURN_VALUE 5 + +/* Defines for SQLProcedures (returned in the result set) */ +#define SQL_PT_UNKNOWN 0 +#define SQL_PT_PROCEDURE 1 +#define SQL_PT_FUNCTION 2 + +/* This define is too large for RC */ +#define SQL_ODBC_KEYWORDS "ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\ +"ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\ +"BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\ +"CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\ +"COLLATE,COLLATION,COLUMN,COMMIT,CONNECT,CONNECTION,CONSTRAINT,"\ +"CONSTRAINTS,CONTINUE,CONVERT,CORRESPONDING,COUNT,CREATE,CROSS,CURRENT,"\ +"CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,"\ +"DATE,DAY,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFERRABLE,"\ +"DEFERRED,DELETE,DESC,DESCRIBE,DESCRIPTOR,DIAGNOSTICS,DISCONNECT,"\ +"DISTINCT,DOMAIN,DOUBLE,DROP,"\ +"ELSE,END,END-EXEC,ESCAPE,EXCEPT,EXCEPTION,EXEC,EXECUTE,"\ +"EXISTS,EXTERNAL,EXTRACT,"\ +"FALSE,FETCH,FIRST,FLOAT,FOR,FOREIGN,FORTRAN,FOUND,FROM,FULL,"\ +"GET,GLOBAL,GO,GOTO,GRANT,GROUP,HAVING,HOUR,"\ +"IDENTITY,IMMEDIATE,IN,INCLUDE,INDEX,INDICATOR,INITIALLY,INNER,"\ +"INPUT,INSENSITIVE,INSERT,INT,INTEGER,INTERSECT,INTERVAL,INTO,IS,ISOLATION,"\ +"JOIN,KEY,LANGUAGE,LAST,LEADING,LEFT,LEVEL,LIKE,LOCAL,LOWER,"\ +"MATCH,MAX,MIN,MINUTE,MODULE,MONTH,"\ +"NAMES,NATIONAL,NATURAL,NCHAR,NEXT,NO,NONE,NOT,NULL,NULLIF,NUMERIC,"\ +"OCTET_LENGTH,OF,ON,ONLY,OPEN,OPTION,OR,ORDER,OUTER,OUTPUT,OVERLAPS,"\ +"PAD,PARTIAL,PASCAL,PLI,POSITION,PRECISION,PREPARE,PRESERVE,"\ +"PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,"\ +"READ,REAL,REFERENCES,RELATIVE,RESTRICT,REVOKE,RIGHT,ROLLBACK,ROWS"\ +"SCHEMA,SCROLL,SECOND,SECTION,SELECT,SESSION,SESSION_USER,SET,SIZE,"\ +"SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\ +"SUBSTRING,SUM,SYSTEM_USER,"\ +"TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\ +"TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\ +"UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\ +"VALUE,VALUES,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,WRITE,"\ +"YEAR,ZONE" + +SQLRETURN SQL_API SQLBrowseConnect( + SQLHDBC hdbc, + SQLCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut); + +#if (ODBCVER >= 0x0300) +SQLRETURN SQL_API SQLBulkOperations( + SQLHSTMT StatementHandle, + SQLSMALLINT Operation); +#endif /* ODBCVER >= 0x0300 */ + +SQLRETURN SQL_API SQLColAttributes( + SQLHSTMT hstmt, + SQLUSMALLINT icol, + SQLUSMALLINT fDescType, + SQLPOINTER rgbDesc, + SQLSMALLINT cbDescMax, + SQLSMALLINT *pcbDesc, + SQLLEN *pfDesc); + +SQLRETURN SQL_API SQLColumnPrivileges( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLCHAR *szColumnName, + SQLSMALLINT cbColumnName); + +SQLRETURN SQL_API SQLDescribeParam( + SQLHSTMT hstmt, + SQLUSMALLINT ipar, + SQLSMALLINT *pfSqlType, + SQLULEN *pcbParamDef, + SQLSMALLINT *pibScale, + SQLSMALLINT *pfNullable); + +SQLRETURN SQL_API SQLExtendedFetch( + SQLHSTMT hstmt, + SQLUSMALLINT fFetchType, + SQLLEN irow, + SQLULEN *pcrow, + SQLUSMALLINT *rgfRowStatus); + +SQLRETURN SQL_API SQLForeignKeys( + SQLHSTMT hstmt, + SQLCHAR *szPkCatalogName, + SQLSMALLINT cbPkCatalogName, + SQLCHAR *szPkSchemaName, + SQLSMALLINT cbPkSchemaName, + SQLCHAR *szPkTableName, + SQLSMALLINT cbPkTableName, + SQLCHAR *szFkCatalogName, + SQLSMALLINT cbFkCatalogName, + SQLCHAR *szFkSchemaName, + SQLSMALLINT cbFkSchemaName, + SQLCHAR *szFkTableName, + SQLSMALLINT cbFkTableName); + +SQLRETURN SQL_API SQLMoreResults( + SQLHSTMT hstmt); + +SQLRETURN SQL_API SQLNativeSql( + SQLHDBC hdbc, + SQLCHAR *szSqlStrIn, + SQLINTEGER cbSqlStrIn, + SQLCHAR *szSqlStr, + SQLINTEGER cbSqlStrMax, + SQLINTEGER *pcbSqlStr); + +SQLRETURN SQL_API SQLNumParams( + SQLHSTMT hstmt, + SQLSMALLINT *pcpar); + +SQLRETURN SQL_API SQLParamOptions( + SQLHSTMT hstmt, + SQLULEN crow, + SQLULEN *pirow); + +SQLRETURN SQL_API SQLPrimaryKeys( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName); + +SQLRETURN SQL_API SQLProcedureColumns( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szProcName, + SQLSMALLINT cbProcName, + SQLCHAR *szColumnName, + SQLSMALLINT cbColumnName); + +SQLRETURN SQL_API SQLProcedures( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szProcName, + SQLSMALLINT cbProcName); + +SQLRETURN SQL_API SQLSetPos( + SQLHSTMT hstmt, + SQLSETPOSIROW irow, + SQLUSMALLINT fOption, + SQLUSMALLINT fLock); + +SQLRETURN SQL_API SQLTablePrivileges( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName); + +SQLRETURN SQL_API SQLDrivers( + SQLHENV henv, + SQLUSMALLINT fDirection, + SQLCHAR *szDriverDesc, + SQLSMALLINT cbDriverDescMax, + SQLSMALLINT *pcbDriverDesc, + SQLCHAR *szDriverAttributes, + SQLSMALLINT cbDrvrAttrMax, + SQLSMALLINT *pcbDrvrAttr); + +SQLRETURN SQL_API SQLBindParameter( + SQLHSTMT hstmt, + SQLUSMALLINT ipar, + SQLSMALLINT fParamType, + SQLSMALLINT fCType, + SQLSMALLINT fSqlType, + SQLULEN cbColDef, + SQLSMALLINT ibScale, + SQLPOINTER rgbValue, + SQLLEN cbValueMax, + SQLLEN *pcbValue); + +/*---------------------------------------------------------*/ +/* SQLAllocHandleStd is implemented to make SQLAllocHandle */ +/* compatible with X/Open standard. an application should */ +/* not call SQLAllocHandleStd directly */ +/*---------------------------------------------------------*/ +#ifdef ODBC_STD +#define SQLAllocHandle SQLAllocHandleStd +#define SQLAllocEnv(phenv) SQLAllocHandleStd(SQL_HANDLE_ENV, SQL_NULL_HANDLE, phenv) + +/* Internal type subcodes */ +#define SQL_YEAR SQL_CODE_YEAR +#define SQL_MONTH SQL_CODE_MONTH +#define SQL_DAY SQL_CODE_DAY +#define SQL_HOUR SQL_CODE_HOUR +#define SQL_MINUTE SQL_CODE_MINUTE +#define SQL_SECOND SQL_CODE_SECOND +#define SQL_YEAR_TO_MONTH SQL_CODE_YEAR_TO_MONTH +#define SQL_DAY_TO_HOUR SQL_CODE_DAY_TO_HOUR +#define SQL_DAY_TO_MINUTE SQL_CODE_DAY_TO_MINUTE +#define SQL_DAY_TO_SECOND SQL_CODE_DAY_TO_SECOND +#define SQL_HOUR_TO_MINUTE SQL_CODE_HOUR_TO_MINUTE +#define SQL_HOUR_TO_SECOND SQL_CODE_HOUR_TO_SECOND +#define SQL_MINUTE_TO_SECOND SQL_CODE_MINUTE_TO_SECOND +#endif /* ODBC_STD */ + +#if (ODBCVER >= 0x0300) +SQLRETURN SQL_API SQLAllocHandleStd( + SQLSMALLINT fHandleType, + SQLHANDLE hInput, + SQLHANDLE *phOutput); +#endif + +/* Deprecated defines from prior versions of ODBC */ +#define SQL_DATABASE_NAME 16 /* Use SQLGetConnectOption/SQL_CURRENT_QUALIFIER */ +#define SQL_FD_FETCH_PREV SQL_FD_FETCH_PRIOR +#define SQL_FETCH_PREV SQL_FETCH_PRIOR +#define SQL_CONCUR_TIMESTAMP SQL_CONCUR_ROWVER +#define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER +#define SQL_CC_DELETE SQL_CB_DELETE +#define SQL_CR_DELETE SQL_CB_DELETE +#define SQL_CC_CLOSE SQL_CB_CLOSE +#define SQL_CR_CLOSE SQL_CB_CLOSE +#define SQL_CC_PRESERVE SQL_CB_PRESERVE +#define SQL_CR_PRESERVE SQL_CB_PRESERVE +/* SQL_FETCH_RESUME is not supported by 2.0+ drivers +#define SQL_FETCH_RESUME 7 +*/ +#define SQL_SCROLL_FORWARD_ONLY 0L /*-SQL_CURSOR_FORWARD_ONLY */ +#define SQL_SCROLL_KEYSET_DRIVEN (-1L) /*-SQL_CURSOR_KEYSET_DRIVEN */ +#define SQL_SCROLL_DYNAMIC (-2L) /*-SQL_CURSOR_DYNAMIC */ +#define SQL_SCROLL_STATIC (-3L) /*-SQL_CURSOR_STATIC */ + +/* Deprecated functions from prior versions of ODBC */ +SQLRETURN SQL_API SQLSetScrollOptions( /* Use SQLSetStmtOptions */ + SQLHSTMT hstmt, + SQLUSMALLINT fConcurrency, + SQLLEN crowKeyset, + SQLUSMALLINT crowRowset); + +/*! + * \defgroup Tracing. + * + * unixODBC implements a slight variation of the tracing mechanism used + * on MS platforms. The unixODBC method loses the ability to produce trace + * output for invalid handles but gains the following; + * + * - better concurrency + * - allows tracing to be turned on/off and configured at finer granularity + * - hopefully; better performance + * + * unixODBC provides a cross-platform helper library called 'trace' and an + * example/default trace plugin called 'odbctrac'. Those writing an ODBC + * driver can use the 'trace' helper library (a static library). Those wanting + * to create custom trace output can implement a different version of the + * 'odbctrac' plugin. + * + * The text file driver (odbctxt) included with unixODBC is an example of a + * driver using the 'trace' helper library. + * + * The 'trace' library and the example plugin 'odbctrac' are designed to be + * portable on all platforms where unixODBC is available and on MS platforms. + * This will allow drivers using 'trace' and 'odbctrac' plugin to equilly + * portable. On MS platforms - this compliments traditional tracing (mostly + * just used by the Driver Manager). + * + * \sa trace + * odbctxt + * odbctrac + */ +/*@{*/ +#define TRACE_VERSION 1000 /*!< Version of trace API */ +#ifdef UNICODE +RETCODE TraceOpenLogFile(SQLPOINTER,LPWSTR,LPWSTR,DWORD); /*!< open a trace log file */ +#else +RETCODE TraceOpenLogFile(SQLPOINTER,LPSTR,LPSTR,DWORD); /*!< open a trace log file */ +#endif +RETCODE TraceCloseLogFile(SQLPOINTER); /*!< Request to close a trace log */ +SQLRETURN TraceReturn(SQLPOINTER,SQLRETURN); /*!< Call to produce trace output upon function return. */ +#ifdef __cplusplus +DWORD TraceVersion(); /*!< Returns trace API version */ +#else +DWORD TraceVersion(VOID); /*!< Returns trace API version */ +#endif + +/* Functions for Visual Studio Analyzer*/ +/* to turn on/off tracing or VS events, call TraceVSControl by setting or clearing the following bits */ +#define TRACE_ON 0x00000001L +#define TRACE_VS_EVENT_ON 0x00000002L + +RETCODE TraceVSControl(DWORD); + +/* the flags in ODBC_VS_ARGS */ +#define ODBC_VS_FLAG_UNICODE_ARG 0x00000001L /* the argument is unicode */ +#define ODBC_VS_FLAG_UNICODE_COR 0x00000002L /* the correlation is unicode */ +#define ODBC_VS_FLAG_RETCODE 0x00000004L /* RetCode field is set */ +#define ODBC_VS_FLAG_STOP 0x00000008L /* Stop firing visual studio analyzer events */ + +typedef struct tagODBC_VS_ARGS { +#ifdef GUID_DEFINED + const GUID *pguidEvent; /* the GUID for event */ +#else + const void *pguidEvent; /* the GUID for event */ +#endif + DWORD dwFlags; /* flags for the call */ + union { + WCHAR *wszArg; + CHAR *szArg; + }u1; + union { + WCHAR *wszCorrelation; + CHAR *szCorrelation; + }u2; + RETCODE RetCode; +} ODBC_VS_ARGS, *PODBC_VS_ARGS; + +VOID FireVSDebugEvent(PODBC_VS_ARGS); +/*@}*/ + +#ifdef __cplusplus +} +#endif + +/* + * connection pooling retry times + */ + +int ODBCSetTryWaitValue ( DWORD dwValue ); +#ifdef __cplusplus +DWORD ODBCGetTryWaitValue ( ); +#else +DWORD ODBCGetTryWaitValue ( VOID ); +#endif + +#ifndef __SQLUCODE_H +#include "odbc/sqlucode.h" +#endif + +#endif diff --git a/external/unixODBC/inc/odbc/sqltypes.h b/external/unixODBC/inc/odbc/sqltypes.h new file mode 100644 index 000000000..5cadacb4c --- /dev/null +++ b/external/unixODBC/inc/odbc/sqltypes.h @@ -0,0 +1,471 @@ +/************************************************************* + * sqltypes.h + * + * This is the lowest level include in unixODBC. It defines + * the basic types required by unixODBC and is heavily based + * upon the MS include of the same name (it has to be for + * binary compatibility between drivers developed under different + * packages). + * + * You can include this file directly but it is almost always + * included indirectly, by including.. for example sqlext.h + * + * This include makes no effort to be useful on any platforms other + * than Linux (with some exceptions for UNIX in general). + * + * !!!DO NOT CONTAMINATE THIS FILE WITH NON-Linux CODE!!! + * + *************************************************************/ +#ifndef __SQLTYPES_H +#define __SQLTYPES_H + +/**************************** + * default to the 3.51 definitions. should define ODBCVER before here if you want an older set of defines + ***************************/ +#ifndef ODBCVER +#define ODBCVER 0x0351 +#endif + +/* + * if this is set, then use a 4 byte unicode definition, instead of the 2 bytes that MS uses + */ + +#ifdef SQL_WCHART_CONVERT +/* + * Use this if you want to use the C/C++ portable definition of a wide char, wchar_t + * Microsoft hardcoded a definition of unsigned short which may not be compatible with + * your platform specific wide char definition. + */ +#include <wchar.h> +#endif + +#include <sal/types.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef SIZEOF_LONG_INT +# define SIZEOF_LONG_INT SAL_TYPES_SIZEOFLONG +#endif +#ifndef ODBCINT64 +# define ODBCINT64 sal_Int64 +#endif +#ifndef UODBCINT64 +# define UODBCINT64 sal_uInt64 +#endif + +/* + * this is defined by configure, but will not be on a normal application build + * the install creates a unixodbc_conf.h file that contains the current build settings + */ + +#ifndef SIZEOF_LONG_INT +#include <unixodbc_conf.h> +#endif + +#ifndef SIZEOF_LONG_INT +#error "Needs to know how big a long int is to continue!!!" +#endif + +/**************************** + * These make up for having no windows.h + ***************************/ +#ifndef ALLREADY_HAVE_WINDOWS_TYPE + +#define FAR +#define CALLBACK +#define SQL_API +#define BOOL int +typedef void* HWND; +typedef char CHAR; +#ifdef UNICODE + +/* + * NOTE: The Microsoft unicode define is only for apps that want to use TCHARs and + * be able to compile for both unicode and non-unicode with the same source. + * This is not recommended for linux applications and is not supported + * by the standard linux string header files. + */ +#ifdef SQL_WCHART_CONVERT +typedef wchar_t TCHAR; +#else +typedef signed short TCHAR; +#endif + +#else +typedef char TCHAR; +#endif + +#ifndef DONT_TD_VOID +typedef void VOID; +#endif + +typedef unsigned short WORD; +#if (SIZEOF_LONG_INT == 4) +typedef unsigned long DWORD; +#else +typedef unsigned int DWORD; +#endif +typedef unsigned char BYTE; + +#ifdef SQL_WCHART_CONVERT +typedef wchar_t WCHAR; +#else +typedef unsigned short WCHAR; +#endif + +typedef WCHAR* LPWSTR; +typedef const char* LPCSTR; +typedef const WCHAR* LPCWSTR; +typedef TCHAR* LPTSTR; +typedef char* LPSTR; +typedef DWORD* LPDWORD; + +typedef void* HINSTANCE; + +#endif + + +/**************************** + * standard SQL* data types. use these as much as possible when using ODBC calls/vars + ***************************/ +typedef unsigned char SQLCHAR; + +#if (ODBCVER >= 0x0300) +typedef unsigned char SQLDATE; +typedef unsigned char SQLDECIMAL; +typedef double SQLDOUBLE; +typedef double SQLFLOAT; +#endif + +/* + * can't use a long it fails on 64 platforms + */ + +/* + * Hopefully by now it should be safe to assume most drivers know about SQLLEN now + * and the default is now sizeof( SQLLEN ) = 8 on 64 bit platforms + * + */ + +#if (SIZEOF_LONG_INT == 8) +#ifdef BUILD_LEGACY_64_BIT_MODE +typedef int SQLINTEGER; +typedef unsigned int SQLUINTEGER; +#define SQLLEN SQLINTEGER +#define SQLULEN SQLUINTEGER +#define SQLSETPOSIROW SQLUSMALLINT +/* + * These are not supported on 64bit ODBC according to MS, removed, so use at your peril + * + typedef SQLULEN SQLROWCOUNT; + typedef SQLULEN SQLROWSETSIZE; + typedef SQLULEN SQLTRANSID; + typedef SQLLEN SQLROWOFFSET; +*/ +#else +typedef int SQLINTEGER; +typedef unsigned int SQLUINTEGER; +typedef long SQLLEN; +typedef unsigned long SQLULEN; +typedef unsigned long SQLSETPOSIROW; +/* + * These are not supported on 64bit ODBC according to MS, removed, so use at your peril + * + typedef SQLULEN SQLTRANSID; + typedef SQLULEN SQLROWCOUNT; + typedef SQLUINTEGER SQLROWSETSIZE; + typedef SQLLEN SQLROWOFFSET; + */ +typedef SQLULEN SQLROWCOUNT; +typedef SQLULEN SQLROWSETSIZE; +typedef SQLULEN SQLTRANSID; +typedef SQLLEN SQLROWOFFSET; +#endif +#else +typedef long SQLINTEGER; +typedef unsigned long SQLUINTEGER; +#define SQLLEN SQLINTEGER +#define SQLULEN SQLUINTEGER +#define SQLSETPOSIROW SQLUSMALLINT +typedef SQLULEN SQLROWCOUNT; +typedef SQLULEN SQLROWSETSIZE; +typedef SQLULEN SQLTRANSID; +typedef SQLLEN SQLROWOFFSET; +#endif + +#if (ODBCVER >= 0x0300) +typedef unsigned char SQLNUMERIC; +#endif + +typedef void * SQLPOINTER; + +#if (ODBCVER >= 0x0300) +typedef float SQLREAL; +#endif + +typedef signed short int SQLSMALLINT; +typedef unsigned short SQLUSMALLINT; + +#if (ODBCVER >= 0x0300) +typedef unsigned char SQLTIME; +typedef unsigned char SQLTIMESTAMP; +typedef unsigned char SQLVARCHAR; +#endif + +typedef SQLSMALLINT SQLRETURN; + +#if (ODBCVER >= 0x0300) +typedef void * SQLHANDLE; +typedef SQLHANDLE SQLHENV; +typedef SQLHANDLE SQLHDBC; +typedef SQLHANDLE SQLHSTMT; +typedef SQLHANDLE SQLHDESC; +#else +typedef void * SQLHENV; +typedef void * SQLHDBC; +typedef void * SQLHSTMT; +/* + * some things like PHP won't build without this + */ +typedef void * SQLHANDLE; +#endif + +/**************************** + * These are cast into the actual struct that is being passed around. The + * DriverManager knows what its structs look like and the Driver knows about its + * structs... the app knows nothing about them... just void* + * These are deprecated in favour of SQLHENV, SQLHDBC, SQLHSTMT + ***************************/ + +#if (ODBCVER >= 0x0300) +typedef SQLHANDLE HENV; +typedef SQLHANDLE HDBC; +typedef SQLHANDLE HSTMT; +#else +typedef void * HENV; +typedef void * HDBC; +typedef void * HSTMT; +#endif + + +/**************************** + * more basic data types to augment what windows.h provides + ***************************/ +#ifndef ALLREADY_HAVE_WINDOWS_TYPE + +typedef unsigned char UCHAR; +typedef signed char SCHAR; +typedef SCHAR SQLSCHAR; +#if (SIZEOF_LONG_INT == 4) +typedef long int SDWORD; +typedef unsigned long int UDWORD; +#else +typedef int SDWORD; +typedef unsigned int UDWORD; +#endif +typedef signed short int SWORD; +typedef unsigned short int UWORD; +typedef unsigned int UINT; +typedef signed long SLONG; +typedef signed short SSHORT; +typedef unsigned long ULONG; +typedef unsigned short USHORT; +typedef double SDOUBLE; +typedef double LDOUBLE; +typedef float SFLOAT; +typedef void* PTR; +typedef signed short RETCODE; +typedef void* SQLHWND; + +#endif + +/**************************** + * standard structs for working with date/times + ***************************/ +#ifndef __SQLDATE +#define __SQLDATE +typedef struct tagDATE_STRUCT +{ + SQLSMALLINT year; + SQLUSMALLINT month; + SQLUSMALLINT day; +} DATE_STRUCT; + +#if (ODBCVER >= 0x0300) +typedef DATE_STRUCT SQL_DATE_STRUCT; +#endif + +typedef struct tagTIME_STRUCT +{ + SQLUSMALLINT hour; + SQLUSMALLINT minute; + SQLUSMALLINT second; +} TIME_STRUCT; + +#if (ODBCVER >= 0x0300) +typedef TIME_STRUCT SQL_TIME_STRUCT; +#endif + +typedef struct tagTIMESTAMP_STRUCT +{ + SQLSMALLINT year; + SQLUSMALLINT month; + SQLUSMALLINT day; + SQLUSMALLINT hour; + SQLUSMALLINT minute; + SQLUSMALLINT second; + SQLUINTEGER fraction; +} TIMESTAMP_STRUCT; + +#if (ODBCVER >= 0x0300) +typedef TIMESTAMP_STRUCT SQL_TIMESTAMP_STRUCT; +#endif + + +#if (ODBCVER >= 0x0300) +typedef enum +{ + SQL_IS_YEAR = 1, + SQL_IS_MONTH = 2, + SQL_IS_DAY = 3, + SQL_IS_HOUR = 4, + SQL_IS_MINUTE = 5, + SQL_IS_SECOND = 6, + SQL_IS_YEAR_TO_MONTH = 7, + SQL_IS_DAY_TO_HOUR = 8, + SQL_IS_DAY_TO_MINUTE = 9, + SQL_IS_DAY_TO_SECOND = 10, + SQL_IS_HOUR_TO_MINUTE = 11, + SQL_IS_HOUR_TO_SECOND = 12, + SQL_IS_MINUTE_TO_SECOND = 13 +} SQLINTERVAL; + +#endif + +#if (ODBCVER >= 0x0300) +typedef struct tagSQL_YEAR_MONTH +{ + SQLUINTEGER year; + SQLUINTEGER month; +} SQL_YEAR_MONTH_STRUCT; + +typedef struct tagSQL_DAY_SECOND +{ + SQLUINTEGER day; + SQLUINTEGER hour; + SQLUINTEGER minute; + SQLUINTEGER second; + SQLUINTEGER fraction; +} SQL_DAY_SECOND_STRUCT; + +typedef struct tagSQL_INTERVAL_STRUCT +{ + SQLINTERVAL interval_type; + SQLSMALLINT interval_sign; + union { + SQL_YEAR_MONTH_STRUCT year_month; + SQL_DAY_SECOND_STRUCT day_second; + } intval; + +} SQL_INTERVAL_STRUCT; + +#endif + +#endif + +#ifndef ODBCINT64 +# if (ODBCVER >= 0x0300) +# if (SIZEOF_LONG_INT == 8) +# define ODBCINT64 long +# define UODBCINT64 unsigned long +# else +# ifdef HAVE_LONG_LONG +# define ODBCINT64 long long +# define UODBCINT64 unsigned long long +# else +/* + * may fail in some cases, but what else can we do ? + */ +struct __bigint_struct +{ + int hiword; + unsigned int loword; +}; +struct __bigint_struct_u +{ + unsigned int hiword; + unsigned int loword; +}; +# define ODBCINT64 struct __bigint_struct +# define UODBCINT64 struct __bigint_struct_u +# endif +# endif +#endif +#endif + +#ifdef ODBCINT64 +typedef ODBCINT64 SQLBIGINT; +#endif +#ifdef UODBCINT64 +typedef UODBCINT64 SQLUBIGINT; +#endif + + +/**************************** + * cursor and bookmark + ***************************/ +#if (ODBCVER >= 0x0300) +#define SQL_MAX_NUMERIC_LEN 16 +typedef struct tagSQL_NUMERIC_STRUCT +{ + SQLCHAR precision; + SQLSCHAR scale; + SQLCHAR sign; /* 1=pos 0=neg */ + SQLCHAR val[SQL_MAX_NUMERIC_LEN]; +} SQL_NUMERIC_STRUCT; +#endif + +#if (ODBCVER >= 0x0350) +#ifdef GUID_DEFINED +#ifndef ALLREADY_HAVE_WINDOWS_TYPE +typedef GUID SQLGUID; +#else +typedef struct tagSQLGUID +{ + DWORD Data1; + WORD Data2; + WORD Data3; + BYTE Data4[ 8 ]; +} SQLGUID; +#endif +#else +typedef struct tagSQLGUID +{ + DWORD Data1; + WORD Data2; + WORD Data3; + BYTE Data4[ 8 ]; +} SQLGUID; +#endif +#endif + +typedef SQLULEN BOOKMARK; + +typedef WCHAR SQLWCHAR; + +#ifdef UNICODE +typedef SQLWCHAR SQLTCHAR; +#else +typedef SQLCHAR SQLTCHAR; +#endif + +#ifdef __cplusplus +} +#endif + +#endif + + + diff --git a/external/unixODBC/inc/odbc/sqlucode.h b/external/unixODBC/inc/odbc/sqlucode.h new file mode 100644 index 000000000..366dab751 --- /dev/null +++ b/external/unixODBC/inc/odbc/sqlucode.h @@ -0,0 +1,789 @@ +/************************************************** + * sqlucode.h + * + * These should be consistent with the MS version. + * + **************************************************/ +#ifndef __SQLUCODE_H +#define __SQLUCODE_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define SQL_WCHAR (-8) +#define SQL_WVARCHAR (-9) +#define SQL_WLONGVARCHAR (-10) +#define SQL_C_WCHAR SQL_WCHAR + +#ifdef UNICODE +#define SQL_C_TCHAR SQL_C_WCHAR +#else +#define SQL_C_TCHAR SQL_C_CHAR +#endif + +#define SQL_SQLSTATE_SIZEW 10 /* size of SQLSTATE for unicode */ + +/* UNICODE versions */ + +SQLRETURN SQL_API SQLColAttributeW( + SQLHSTMT hstmt, + SQLUSMALLINT iCol, + SQLUSMALLINT iField, + SQLPOINTER pCharAttr, + SQLSMALLINT cbCharAttrMax, + SQLSMALLINT *pcbCharAttr, + SQLLEN *pNumAttr); + +SQLRETURN SQL_API SQLColAttributesW( + SQLHSTMT hstmt, + SQLUSMALLINT icol, + SQLUSMALLINT fDescType, + SQLPOINTER rgbDesc, + SQLSMALLINT cbDescMax, + SQLSMALLINT *pcbDesc, + SQLLEN *pfDesc); + +SQLRETURN SQL_API SQLConnectW( + SQLHDBC hdbc, + SQLWCHAR *szDSN, + SQLSMALLINT cbDSN, + SQLWCHAR *szUID, + SQLSMALLINT cbUID, + SQLWCHAR *szAuthStr, + SQLSMALLINT cbAuthStr); + + +SQLRETURN SQL_API SQLDescribeColW( + SQLHSTMT hstmt, + SQLUSMALLINT icol, + SQLWCHAR *szColName, + SQLSMALLINT cbColNameMax, + SQLSMALLINT *pcbColName, + SQLSMALLINT *pfSqlType, + SQLULEN *pcbColDef, + SQLSMALLINT *pibScale, + SQLSMALLINT *pfNullable); + + +SQLRETURN SQL_API SQLErrorW( + SQLHENV henv, + SQLHDBC hdbc, + SQLHSTMT hstmt, + SQLWCHAR *szSqlState, + SQLINTEGER *pfNativeError, + SQLWCHAR *szErrorMsg, + SQLSMALLINT cbErrorMsgMax, + SQLSMALLINT *pcbErrorMsg); + +SQLRETURN SQL_API SQLExecDirectW( + SQLHSTMT hstmt, + SQLWCHAR *szSqlStr, + SQLINTEGER cbSqlStr); + +SQLRETURN SQL_API SQLGetConnectAttrW( + SQLHDBC hdbc, + SQLINTEGER fAttribute, + SQLPOINTER rgbValue, + SQLINTEGER cbValueMax, + SQLINTEGER *pcbValue); + +SQLRETURN SQL_API SQLGetCursorNameW( + SQLHSTMT hstmt, + SQLWCHAR *szCursor, + SQLSMALLINT cbCursorMax, + SQLSMALLINT *pcbCursor); + +#if (ODBCVER >= 0x0300) +SQLRETURN SQL_API SQLSetDescFieldW(SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, + SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, + SQLINTEGER BufferLength); + + + +SQLRETURN SQL_API SQLGetDescFieldW( + SQLHDESC hdesc, + SQLSMALLINT iRecord, + SQLSMALLINT iField, + SQLPOINTER rgbValue, + SQLINTEGER cbValueMax, + SQLINTEGER *pcbValue); + +SQLRETURN SQL_API SQLGetDescRecW( + SQLHDESC hdesc, + SQLSMALLINT iRecord, + SQLWCHAR *szName, + SQLSMALLINT cbNameMax, + SQLSMALLINT *pcbName, + SQLSMALLINT *pfType, + SQLSMALLINT *pfSubType, + SQLLEN *pLength, + SQLSMALLINT *pPrecision, + SQLSMALLINT *pScale, + SQLSMALLINT *pNullable); + +SQLRETURN SQL_API SQLGetDiagFieldW( + SQLSMALLINT fHandleType, + SQLHANDLE handle, + SQLSMALLINT iRecord, + SQLSMALLINT fDiagField, + SQLPOINTER rgbDiagInfo, + SQLSMALLINT cbDiagInfoMax, + SQLSMALLINT *pcbDiagInfo); + +SQLRETURN SQL_API SQLGetDiagRecW( + SQLSMALLINT fHandleType, + SQLHANDLE handle, + SQLSMALLINT iRecord, + SQLWCHAR *szSqlState, + SQLINTEGER *pfNativeError, + SQLWCHAR *szErrorMsg, + SQLSMALLINT cbErrorMsgMax, + SQLSMALLINT *pcbErrorMsg); + + +#endif + + +SQLRETURN SQL_API SQLPrepareW( + SQLHSTMT hstmt, + SQLWCHAR *szSqlStr, + SQLINTEGER cbSqlStr); + +SQLRETURN SQL_API SQLSetConnectAttrW( + SQLHDBC hdbc, + SQLINTEGER fAttribute, + SQLPOINTER rgbValue, + SQLINTEGER cbValue); + +SQLRETURN SQL_API SQLSetCursorNameW( + SQLHSTMT hstmt, + SQLWCHAR *szCursor, + SQLSMALLINT cbCursor); + + + + + + + +SQLRETURN SQL_API SQLColumnsW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLWCHAR *szColumnName, + SQLSMALLINT cbColumnName); + +SQLRETURN SQL_API SQLGetConnectOptionW( + SQLHDBC hdbc, + SQLUSMALLINT fOption, + SQLPOINTER pvParam); + + + +SQLRETURN SQL_API SQLGetInfoW( + SQLHDBC hdbc, + SQLUSMALLINT fInfoType, + SQLPOINTER rgbInfoValue, + SQLSMALLINT cbInfoValueMax, + SQLSMALLINT *pcbInfoValue); + +SQLRETURN SQL_API SQLGetTypeInfoW( + SQLHSTMT StatementHandle, + SQLSMALLINT DataType); + + +SQLRETURN SQL_API SQLSetConnectOptionW( + SQLHDBC hdbc, + SQLUSMALLINT fOption, + SQLULEN vParam); + + +SQLRETURN SQL_API SQLSpecialColumnsW( + SQLHSTMT hstmt, + SQLUSMALLINT fColType, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLUSMALLINT fScope, + SQLUSMALLINT fNullable); + +SQLRETURN SQL_API SQLStatisticsW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLUSMALLINT fUnique, + SQLUSMALLINT fAccuracy); + +SQLRETURN SQL_API SQLTablesW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLWCHAR *szTableType, + SQLSMALLINT cbTableType); + + + +SQLRETURN SQL_API SQLDataSourcesW( + SQLHENV henv, + SQLUSMALLINT fDirection, + SQLWCHAR *szDSN, + SQLSMALLINT cbDSNMax, + SQLSMALLINT *pcbDSN, + SQLWCHAR *szDescription, + SQLSMALLINT cbDescriptionMax, + SQLSMALLINT *pcbDescription); + + + + +SQLRETURN SQL_API SQLDriverConnectW( + SQLHDBC hdbc, + SQLHWND hwnd, + SQLWCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLWCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut, + SQLUSMALLINT fDriverCompletion); + + +SQLRETURN SQL_API SQLBrowseConnectW( + SQLHDBC hdbc, + SQLWCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLWCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut); + +SQLRETURN SQL_API SQLColumnPrivilegesW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLWCHAR *szColumnName, + SQLSMALLINT cbColumnName); + +SQLRETURN SQL_API SQLGetStmtAttrW( + SQLHSTMT hstmt, + SQLINTEGER fAttribute, + SQLPOINTER rgbValue, + SQLINTEGER cbValueMax, + SQLINTEGER *pcbValue); + +SQLRETURN SQL_API SQLSetStmtAttrW( + SQLHSTMT hstmt, + SQLINTEGER fAttribute, + SQLPOINTER rgbValue, + SQLINTEGER cbValueMax); + +SQLRETURN SQL_API SQLForeignKeysW( + SQLHSTMT hstmt, + SQLWCHAR *szPkCatalogName, + SQLSMALLINT cbPkCatalogName, + SQLWCHAR *szPkSchemaName, + SQLSMALLINT cbPkSchemaName, + SQLWCHAR *szPkTableName, + SQLSMALLINT cbPkTableName, + SQLWCHAR *szFkCatalogName, + SQLSMALLINT cbFkCatalogName, + SQLWCHAR *szFkSchemaName, + SQLSMALLINT cbFkSchemaName, + SQLWCHAR *szFkTableName, + SQLSMALLINT cbFkTableName); + + +SQLRETURN SQL_API SQLNativeSqlW( + SQLHDBC hdbc, + SQLWCHAR *szSqlStrIn, + SQLINTEGER cbSqlStrIn, + SQLWCHAR *szSqlStr, + SQLINTEGER cbSqlStrMax, + SQLINTEGER *pcbSqlStr); + + +SQLRETURN SQL_API SQLPrimaryKeysW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName); + +SQLRETURN SQL_API SQLProcedureColumnsW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szProcName, + SQLSMALLINT cbProcName, + SQLWCHAR *szColumnName, + SQLSMALLINT cbColumnName); + +SQLRETURN SQL_API SQLProceduresW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szProcName, + SQLSMALLINT cbProcName); + + +SQLRETURN SQL_API SQLTablePrivilegesW( + SQLHSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName); + +SQLRETURN SQL_API SQLDriversW( + SQLHENV henv, + SQLUSMALLINT fDirection, + SQLWCHAR *szDriverDesc, + SQLSMALLINT cbDriverDescMax, + SQLSMALLINT *pcbDriverDesc, + SQLWCHAR *szDriverAttributes, + SQLSMALLINT cbDrvrAttrMax, + SQLSMALLINT *pcbDrvrAttr); + + +/* ANSI versions */ + +SQLRETURN SQL_API SQLColAttributeA( + SQLHSTMT hstmt, + SQLSMALLINT iCol, + SQLSMALLINT iField, + SQLPOINTER pCharAttr, + SQLSMALLINT cbCharAttrMax, + SQLSMALLINT *pcbCharAttr, + SQLLEN *pNumAttr); + +SQLRETURN SQL_API SQLColAttributesA( + SQLHSTMT hstmt, + SQLUSMALLINT icol, + SQLUSMALLINT fDescType, + SQLPOINTER rgbDesc, + SQLSMALLINT cbDescMax, + SQLSMALLINT *pcbDesc, + SQLLEN *pfDesc); + +SQLRETURN SQL_API SQLConnectA( + SQLHDBC hdbc, + SQLCHAR *szDSN, + SQLSMALLINT cbDSN, + SQLCHAR *szUID, + SQLSMALLINT cbUID, + SQLCHAR *szAuthStr, + SQLSMALLINT cbAuthStr); + + +SQLRETURN SQL_API SQLDescribeColA( + SQLHSTMT hstmt, + SQLUSMALLINT icol, + SQLCHAR *szColName, + SQLSMALLINT cbColNameMax, + SQLSMALLINT *pcbColName, + SQLSMALLINT *pfSqlType, + SQLULEN *pcbColDef, + SQLSMALLINT *pibScale, + SQLSMALLINT *pfNullable); + + +SQLRETURN SQL_API SQLErrorA( + SQLHENV henv, + SQLHDBC hdbc, + SQLHSTMT hstmt, + SQLCHAR *szSqlState, + SQLINTEGER *pfNativeError, + SQLCHAR *szErrorMsg, + SQLSMALLINT cbErrorMsgMax, + SQLSMALLINT *pcbErrorMsg); + +SQLRETURN SQL_API SQLExecDirectA( + SQLHSTMT hstmt, + SQLCHAR *szSqlStr, + SQLINTEGER cbSqlStr); + +SQLRETURN SQL_API SQLGetConnectAttrA( + SQLHDBC hdbc, + SQLINTEGER fAttribute, + SQLPOINTER rgbValue, + SQLINTEGER cbValueMax, + SQLINTEGER *pcbValue); + +SQLRETURN SQL_API SQLGetCursorNameA( + SQLHSTMT hstmt, + SQLCHAR *szCursor, + SQLSMALLINT cbCursorMax, + SQLSMALLINT *pcbCursor); + +#if (ODBCVER >= 0x0300) +SQLRETURN SQL_API SQLGetDescFieldA( + SQLHDESC hdesc, + SQLSMALLINT iRecord, + SQLSMALLINT iField, + SQLPOINTER rgbValue, + SQLINTEGER cbValueMax, + SQLINTEGER *pcbValue); + +SQLRETURN SQL_API SQLGetDescRecA( + SQLHDESC hdesc, + SQLSMALLINT iRecord, + SQLCHAR *szName, + SQLSMALLINT cbNameMax, + SQLSMALLINT *pcbName, + SQLSMALLINT *pfType, + SQLSMALLINT *pfSubType, + SQLLEN *pLength, + SQLSMALLINT *pPrecision, + SQLSMALLINT *pScale, + SQLSMALLINT *pNullable); + +SQLRETURN SQL_API SQLGetDiagFieldA( + SQLSMALLINT fHandleType, + SQLHANDLE handle, + SQLSMALLINT iRecord, + SQLSMALLINT fDiagField, + SQLPOINTER rgbDiagInfo, + SQLSMALLINT cbDiagInfoMax, + SQLSMALLINT *pcbDiagInfo); + +SQLRETURN SQL_API SQLGetDiagRecA( + SQLSMALLINT fHandleType, + SQLHANDLE handle, + SQLSMALLINT iRecord, + SQLCHAR *szSqlState, + SQLINTEGER *pfNativeError, + SQLCHAR *szErrorMsg, + SQLSMALLINT cbErrorMsgMax, + SQLSMALLINT *pcbErrorMsg); + + +SQLRETURN SQL_API SQLGetStmtAttrA( + SQLHSTMT hstmt, + SQLINTEGER fAttribute, + SQLPOINTER rgbValue, + SQLINTEGER cbValueMax, + SQLINTEGER *pcbValue); + +#endif + +SQLRETURN SQL_API SQLGetTypeInfoA( + SQLHSTMT StatementHandle, + SQLSMALLINT DataTyoe); + +SQLRETURN SQL_API SQLPrepareA( + SQLHSTMT hstmt, + SQLCHAR *szSqlStr, + SQLINTEGER cbSqlStr); + +SQLRETURN SQL_API SQLSetConnectAttrA( + SQLHDBC hdbc, + SQLINTEGER fAttribute, + SQLPOINTER rgbValue, + SQLINTEGER cbValue); + +SQLRETURN SQL_API SQLSetCursorNameA( + SQLHSTMT hstmt, + SQLCHAR *szCursor, + SQLSMALLINT cbCursor); + + + + + + + +SQLRETURN SQL_API SQLColumnsA( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLCHAR *szColumnName, + SQLSMALLINT cbColumnName); + +SQLRETURN SQL_API SQLGetConnectOptionA( + SQLHDBC hdbc, + SQLUSMALLINT fOption, + SQLPOINTER pvParam); + + + +SQLRETURN SQL_API SQLGetInfoA( + SQLHDBC hdbc, + SQLUSMALLINT fInfoType, + SQLPOINTER rgbInfoValue, + SQLSMALLINT cbInfoValueMax, + SQLSMALLINT* pcbInfoValue); + +SQLRETURN SQL_API SQLGetStmtOptionA( + SQLHSTMT hstmt, + SQLUSMALLINT fOption, + SQLPOINTER pvParam); + +SQLRETURN SQL_API SQLSetConnectOptionA( + SQLHDBC hdbc, + SQLUSMALLINT fOption, + SQLULEN vParam); + +SQLRETURN SQL_API SQLSetStmtOptionA( + SQLHSTMT hstmt, + SQLUSMALLINT fOption, + SQLULEN vParam); + +SQLRETURN SQL_API SQLSpecialColumnsA( + SQLHSTMT hstmt, + SQLUSMALLINT fColType, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLUSMALLINT fScope, + SQLUSMALLINT fNullable); + +SQLRETURN SQL_API SQLStatisticsA( + SQLHSTMT hstmt, + + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLUSMALLINT fUnique, + SQLUSMALLINT fAccuracy); + +SQLRETURN SQL_API SQLTablesA( + SQLHSTMT hstmt, + + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLCHAR *szTableType, + + SQLSMALLINT cbTableType); + + + +SQLRETURN SQL_API SQLDataSourcesA( + SQLHENV henv, + SQLUSMALLINT fDirection, + SQLCHAR *szDSN, + SQLSMALLINT cbDSNMax, + SQLSMALLINT *pcbDSN, + SQLCHAR *szDescription, + SQLSMALLINT cbDescriptionMax, + SQLSMALLINT *pcbDescription); + + + + +SQLRETURN SQL_API SQLDriverConnectA( + SQLHDBC hdbc, + SQLHWND hwnd, + SQLCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut, + SQLUSMALLINT fDriverCompletion); + + +SQLRETURN SQL_API SQLBrowseConnectA( + SQLHDBC hdbc, + SQLCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut); + +SQLRETURN SQL_API SQLColumnPrivilegesA( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLCHAR *szColumnName, + SQLSMALLINT cbColumnName); + +SQLRETURN SQL_API SQLDescribeParamA( + SQLHSTMT hstmt, + SQLUSMALLINT ipar, + SQLSMALLINT *pfSqlType, + SQLUINTEGER *pcbParamDef, + SQLSMALLINT *pibScale, + SQLSMALLINT *pfNullable); + + +SQLRETURN SQL_API SQLForeignKeysA( + SQLHSTMT hstmt, + SQLCHAR *szPkCatalogName, + SQLSMALLINT cbPkCatalogName, + SQLCHAR *szPkSchemaName, + SQLSMALLINT cbPkSchemaName, + SQLCHAR *szPkTableName, + SQLSMALLINT cbPkTableName, + SQLCHAR *szFkCatalogName, + SQLSMALLINT cbFkCatalogName, + SQLCHAR *szFkSchemaName, + SQLSMALLINT cbFkSchemaName, + SQLCHAR *szFkTableName, + SQLSMALLINT cbFkTableName); + + +SQLRETURN SQL_API SQLNativeSqlA( + SQLHDBC hdbc, + SQLCHAR *szSqlStrIn, + SQLINTEGER cbSqlStrIn, + SQLCHAR *szSqlStr, + SQLINTEGER cbSqlStrMax, + SQLINTEGER *pcbSqlStr); + + +SQLRETURN SQL_API SQLPrimaryKeysA( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName); + +SQLRETURN SQL_API SQLProcedureColumnsA( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szProcName, + SQLSMALLINT cbProcName, + SQLCHAR *szColumnName, + SQLSMALLINT cbColumnName); + +SQLRETURN SQL_API SQLProceduresA( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szProcName, + SQLSMALLINT cbProcName); + + +SQLRETURN SQL_API SQLTablePrivilegesA( + SQLHSTMT hstmt, + SQLCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLCHAR *szTableName, + SQLSMALLINT cbTableName); + +SQLRETURN SQL_API SQLDriversA( + SQLHENV henv, + SQLUSMALLINT fDirection, + SQLCHAR *szDriverDesc, + SQLSMALLINT cbDriverDescMax, + SQLSMALLINT *pcbDriverDesc, + SQLCHAR *szDriverAttributes, + SQLSMALLINT cbDrvrAttrMax, + SQLSMALLINT *pcbDrvrAttr); + + + + + +/*---------------------------------------------*/ +/* Mapping macros for Unicode */ +/*---------------------------------------------*/ + +#ifndef SQL_NOUNICODEMAP /* define this to disable the mapping */ +#ifdef UNICODE + +#define SQLColAttribute SQLColAttributeW +#define SQLColAttributes SQLColAttributesW +#define SQLConnect SQLConnectW +#define SQLDescribeCol SQLDescribeColW +#define SQLError SQLErrorW +#define SQLExecDirect SQLExecDirectW +#define SQLGetConnectAttr SQLGetConnectAttrW +#define SQLGetCursorName SQLGetCursorNameW +#define SQLGetDescField SQLGetDescFieldW +#define SQLGetDescRec SQLGetDescRecW +#define SQLGetDiagField SQLGetDiagFieldW +#define SQLGetDiagRec SQLGetDiagRecW +#define SQLPrepare SQLPrepareW +#define SQLSetConnectAttr SQLSetConnectAttrW +#define SQLSetCursorName SQLSetCursorNameW +#define SQLSetDescField SQLSetDescFieldW +#define SQLSetStmtAttr SQLSetStmtAttrW +#define SQLGetStmtAttr SQLGetStmtAttrW +#define SQLColumns SQLColumnsW +#define SQLGetConnectOption SQLGetConnectOptionW +#define SQLGetInfo SQLGetInfoW +#define SQLGetTypeInfo SQLGetTypeInfoW +#define SQLSetConnectOption SQLSetConnectOptionW +#define SQLSpecialColumns SQLSpecialColumnsW +#define SQLStatistics SQLStatisticsW +#define SQLTables SQLTablesW +#define SQLDataSources SQLDataSourcesW +#define SQLDriverConnect SQLDriverConnectW +#define SQLBrowseConnect SQLBrowseConnectW +#define SQLColumnPrivileges SQLColumnPrivilegesW +#define SQLForeignKeys SQLForeignKeysW +#define SQLNativeSql SQLNativeSqlW +#define SQLPrimaryKeys SQLPrimaryKeysW +#define SQLProcedureColumns SQLProcedureColumnsW +#define SQLProcedures SQLProceduresW +#define SQLTablePrivileges SQLTablePrivilegesW +#define SQLDrivers SQLDriversW + +#endif /* UNICODE */ +#endif /* SQL_NOUNICODEMAP */ + +#ifdef __cplusplus +} +#endif + +#ifndef __SQLEXT_H +#include <odbx/sqlext.h> + +#endif + + +#endif diff --git a/external/xmlsec/ExternalPackage_xmlsec.mk b/external/xmlsec/ExternalPackage_xmlsec.mk new file mode 100644 index 000000000..68ddfaff8 --- /dev/null +++ b/external/xmlsec/ExternalPackage_xmlsec.mk @@ -0,0 +1,19 @@ +# -*- 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_ExternalPackage_ExternalPackage,xmlsec,xmlsec)) + +$(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec)) + +ifeq ($(OS),WNT) +$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec-mscng.dll,win32/binaries/libxmlsec-mscng.dll)) +$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec.dll,win32/binaries/libxmlsec.dll)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/xmlsec/ExternalProject_xmlsec.mk b/external/xmlsec/ExternalProject_xmlsec.mk new file mode 100644 index 000000000..c530b69d5 --- /dev/null +++ b/external/xmlsec/ExternalProject_xmlsec.mk @@ -0,0 +1,61 @@ +# -*- 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,xmlsec)) + +$(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2)) + +$(eval $(call gb_ExternalProject_use_external,xmlsec,nss3)) + +$(eval $(call gb_ExternalProject_register_targets,xmlsec,\ + build \ +)) + +ifeq ($(OS),WNT) + +$(eval $(call gb_ExternalProject_use_nmake,xmlsec,build)) + +$(call gb_ExternalProject_get_state_target,xmlsec,build) : + $(call gb_Trace_StartRange,xmlsec,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + cscript /e:javascript configure.js crypto=mscng xslt=no iconv=no static=no \ + lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \ + $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes cruntime=/MDd) \ + cflags="$(SOLARINC) -I$(WORKDIR)/UnpackedTarball/libxml2/include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common" \ + && nmake \ + ,win32) + $(call gb_Trace_EndRange,xmlsec,EXTERNAL) + +else + +$(call gb_ExternalProject_get_state_target,xmlsec,build) : + $(call gb_Trace_StartRange,xmlsec,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + $(if $(filter iOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \ + $(if $(filter AIX,$(OS)),ACLOCAL="aclocal -I /opt/freeware/share/aclocal") \ + autoreconf \ + && ./configure \ + --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls --without-gcrypt --disable-apps --disable-docs \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CFLAGS="$(CFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS)) $(gb_VISIBILITY_FLAGS)" \ + --without-openssl \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \ + $(if $(SYSTEM_NSS),,NSPR_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" NSPR_LIBS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lnspr4") \ + $(if $(SYSTEM_NSS),,NSS_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss" NSS_LIBS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lsmime3 -lnss3 -lnssutil3") \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ + LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),",-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)) \ + && $(MAKE) \ + ) + $(call gb_Trace_EndRange,xmlsec,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/xmlsec/Makefile b/external/xmlsec/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/xmlsec/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/xmlsec/Module_xmlsec.mk b/external/xmlsec/Module_xmlsec.mk new file mode 100644 index 000000000..55b0a4654 --- /dev/null +++ b/external/xmlsec/Module_xmlsec.mk @@ -0,0 +1,18 @@ +# -*- 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,xmlsec)) + +$(eval $(call gb_Module_add_targets,xmlsec,\ + UnpackedTarball_xmlsec \ + ExternalPackage_xmlsec \ + ExternalProject_xmlsec \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/xmlsec/README b/external/xmlsec/README new file mode 100644 index 000000000..9f2c5e5e7 --- /dev/null +++ b/external/xmlsec/README @@ -0,0 +1,5 @@ +XML signing, etc. From [http://www.aleksey.com/xmlsec/]. + +The certificate vertification functionality of libxmlsec is not used, both the +mscng and nss backends specify the +XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS flag during verification. diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk b/external/xmlsec/UnpackedTarball_xmlsec.mk new file mode 100644 index 000000000..e4d092bef --- /dev/null +++ b/external/xmlsec/UnpackedTarball_xmlsec.mk @@ -0,0 +1,20 @@ +# -*- 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/. +# + +xmlsec_patches := + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec)) + +$(eval $(call gb_UnpackedTarball_set_tarball,xmlsec,$(XMLSEC_TARBALL),,xmlsec)) + +$(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\ + $(foreach patch,$(xmlsec_patches),external/xmlsec/$(patch)) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/xsltml/Makefile b/external/xsltml/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/xsltml/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/xsltml/Module_xsltml.mk b/external/xsltml/Module_xsltml.mk new file mode 100644 index 000000000..09877a7e7 --- /dev/null +++ b/external/xsltml/Module_xsltml.mk @@ -0,0 +1,20 @@ +# -*- 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,xsltml)) + +ifeq ($(ENABLE_MEDIAWIKI),TRUE) + +$(eval $(call gb_Module_add_targets,xsltml,\ + UnpackedTarball_xsltml \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/xsltml/README b/external/xsltml/README new file mode 100644 index 000000000..ab22e5e59 --- /dev/null +++ b/external/xsltml/README @@ -0,0 +1,14 @@ +XSLT MathML Library from [http://xsltml.sourceforge.net/]. + +This project is used in the Wiki filter that is installed +with the WikiPublisher extension. The extension is built +in mudule swext. + +Building of the module provides a set of xslt transformation +related files that are used by the filter to transform +embedded formula objects into media wiki format. + +The archive was downloaded from: +[http://xsltml.sourceforge.net] +on 2009-02-16. + diff --git a/external/xsltml/UnpackedTarball_xsltml.mk b/external/xsltml/UnpackedTarball_xsltml.mk new file mode 100644 index 000000000..743f2a01a --- /dev/null +++ b/external/xsltml/UnpackedTarball_xsltml.mk @@ -0,0 +1,28 @@ +# -*- 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,xsltml)) + +$(eval $(call gb_UnpackedTarball_set_tarball,xsltml,$(XSLTML_TARBALL),0)) + +$(eval $(call gb_UnpackedTarball_fix_end_of_line,xsltml,\ + cmarkup.xsl \ + entities.xsl \ + glayout.xsl \ + mmltex.xsl \ + scripts.xsl \ + tables.xsl \ + tokens.xsl \ +)) + +$(eval $(call gb_UnpackedTarball_add_patches,xsltml,\ + external/xsltml/xsltml_2.1.2.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/xsltml/xsltml_2.1.2.patch b/external/xsltml/xsltml_2.1.2.patch new file mode 100644 index 000000000..f02b0c594 --- /dev/null +++ b/external/xsltml/xsltml_2.1.2.patch @@ -0,0 +1,1718 @@ +--- misc/xsltml_2.1.2/cmarkup.xsl 2009-03-27 08:11:02.000000000 +0100 ++++ misc/build/xsltml_2.1.2/cmarkup.xsl 2008-03-07 21:36:34.000000000 +0100 +@@ -5,9 +5,9 @@ + version='1.0'> + + <!-- ====================================================================== --> +-<!-- $Id: cmarkup.xsl,v 1.8 2003/06/10 12:24:04 shade33 Exp $ ++<!-- $Id: cmarkup.xsl 2755 2008-03-07 20:35:56Z hauma $ + This file is part of the XSLT MathML Library distribution. +- See ./README or http://www.raleigh.ru/MathML/mmltex for ++ See ./README or http://xsltml.sf.net for + copyright and other information --> + <!-- ====================================================================== --> + +@@ -156,7 +156,7 @@ + <xsl:text> & \text{if $</xsl:text> + <xsl:apply-templates select="*[2]"/> + <xsl:text>$}</xsl:text> +- <xsl:if test="not(position()=last()) or ../m:otherwise"><xsl:text>\\ </xsl:text></xsl:if> ++ <xsl:if test="not(position()=last()) or ../m:otherwise"><xsl:text>\\ </xsl:text></xsl:if> + </xsl:template> + + <xsl:template match="m:otherwise"> +@@ -223,7 +223,7 @@ + <xsl:template match="m:apply[*[1][self::m:minus] and count(*)=2]"> + <xsl:text>-</xsl:text> + <xsl:apply-templates select="*[2]"> +- <xsl:with-param name="p" select="5"/> ++ <xsl:with-param name="p" select="2"/> + </xsl:apply-templates> + </xsl:template> + +@@ -234,7 +234,8 @@ + <xsl:with-param name="p" select="$p"/> + <xsl:with-param name="this-p" select="2"/> + </xsl:call-template> +-</xsl:template> ++</xsl:template> ++ + + <!-- 4.4.3.6 plus--> + <xsl:template match="m:apply[*[1][self::m:plus]]"> +@@ -585,12 +586,15 @@ + </xsl:template> + + <xsl:template match="m:apply[*[1][self::m:partialdiff]]" priority="1"> +- <xsl:text>\frac{\partial^{</xsl:text> ++ <xsl:text>\frac{\partial</xsl:text> + <xsl:choose> + <xsl:when test="m:degree"> ++ <xsl:text>^{</xsl:text> + <xsl:apply-templates select="m:degree/node()"/> ++ <xsl:text>}</xsl:text> + </xsl:when> + <xsl:when test="m:bvar/m:degree[string(number(.))='NaN']"> ++ <xsl:text>^{</xsl:text> + <xsl:for-each select="m:bvar/m:degree"> + <xsl:apply-templates select="node()"/> + <xsl:if test="position()<last()"><xsl:text>+</xsl:text></xsl:if> +@@ -599,12 +603,15 @@ + <xsl:text>+</xsl:text> + <xsl:value-of select="count(m:bvar[not(m:degree)])"/> + </xsl:if> ++ <xsl:text>}</xsl:text> ++ </xsl:when> ++ <xsl:when test="sum(m:bvar/m:degree)+count(m:bvar[not(m:degree)]) > 1"> ++ <xsl:text>^{</xsl:text> ++ <xsl:value-of select="sum(m:bvar/m:degree)+count(m:bvar[not(m:degree)])"/> ++ <xsl:text>}</xsl:text> + </xsl:when> +- <xsl:otherwise> +- <xsl:value-of select="sum(m:bvar/m:degree)+count(m:bvar[not(m:degree)])"/> +- </xsl:otherwise> + </xsl:choose> +- <xsl:text>}</xsl:text> ++ <xsl:text> </xsl:text> + <xsl:apply-templates select="*[last()]"/> + <xsl:text>}{</xsl:text> + <xsl:for-each select="m:bvar"> +@@ -943,7 +950,7 @@ + <xsl:text>\left(\begin{array}{c}</xsl:text> + <xsl:for-each select="*"> + <xsl:apply-templates select="."/> +- <xsl:if test="position()!=last()"><xsl:text>\\ </xsl:text></xsl:if> ++ <xsl:if test="position()!=last()"><xsl:text>\\ </xsl:text></xsl:if> + </xsl:for-each> + <xsl:text>\end{array}\right)</xsl:text> + </xsl:template> +@@ -961,7 +968,7 @@ + <xsl:apply-templates select="."/> + <xsl:if test="position()!=last()"><xsl:text> & </xsl:text></xsl:if> + </xsl:for-each> +- <xsl:if test="position()!=last()"><xsl:text>\\ </xsl:text></xsl:if> ++ <xsl:if test="position()!=last()"><xsl:text>\\ </xsl:text></xsl:if> + </xsl:template> + + <!-- 4.4.10.4 determinant --> +--- misc/xsltml_2.1.2/entities.xsl 2009-03-27 08:11:02.000000000 +0100 ++++ misc/build/xsltml_2.1.2/entities.xsl 2008-03-07 21:36:34.000000000 +0100 +@@ -4,17 +4,56 @@ + version='1.0'> + + <!-- ====================================================================== --> +-<!-- $Id: entities.xsl,v 1.13 2003/06/10 12:28:03 shade33 Exp $ ++<!-- $Id: entities.xsl 2755 2008-03-07 20:35:56Z hauma $ + This file is part of the XSLT MathML Library distribution. +- See ./README or http://www.raleigh.ru/MathML/mmltex for ++ See ./README or http://xsltml.sf.net for + copyright and other information --> + <!-- ====================================================================== --> ++<xsl:variable name="apos">'</xsl:variable> ++ ++<!-- ++ Missing MathML equivalents for: ++ ++ a \leslant b ++ a \geslant b ++ ++ Unsupported in WikiMedia: ++ ++ \oiint x ++ \oiiint x ++ ƛ ++ \adots ++ ++ --> + + <xsl:template name="replaceEntities"> + <xsl:param name="content"/> + <xsl:if test="string-length($content)>0"> + <xsl:choose> + <xsl:when test="starts-with($content,' ')"><xsl:value-of select="'\; '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'   ')"><xsl:value-of select="'\; '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '   ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'#')"><xsl:value-of select="'\# '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '#')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'$')"><xsl:value-of select="'\$ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '$')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'%')"><xsl:value-of select="'\% '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '%')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'&')"><xsl:value-of select="'\& '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'*')"><xsl:value-of select="'\ast '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '*')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,':')"><xsl:value-of select="'\colon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ':')"/></xsl:call-template></xsl:when> ++ <!-- Note: \less is not supported by WikiMedia. --> ++ <xsl:when test="starts-with($content,'<')"><xsl:value-of select="'< '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '<')"/></xsl:call-template></xsl:when> ++ <!-- Note: \greater is not supported by WikiMedia. --> ++ <xsl:when test="starts-with($content,'>')"><xsl:value-of select="'> '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '>')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'[')"><xsl:value-of select="'\lbrack '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '[')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'\')"><xsl:value-of select="'\backslash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '\')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,']')"><xsl:value-of select="'\rbrack '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ']')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'^')"><xsl:value-of select="'\textasciicircumflex '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '^')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'_')"><xsl:value-of select="'\_ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '_')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'`')"><xsl:value-of select="'\textasciigrave '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '`')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'{')"><xsl:value-of select="'\lbrace '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '{')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'|')"><xsl:value-of select="'\vert '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '|')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'}')"><xsl:value-of select="'\rbrace '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '}')"/></xsl:call-template></xsl:when> ++ <!-- Note: \textasciitilde is not supported by WikiMedia. --> ++ <xsl:when test="starts-with($content,'~')"><xsl:value-of select="'\sim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '~')"/></xsl:call-template></xsl:when> ++ + <xsl:when test="starts-with($content,'ɛ')"><xsl:value-of select="'\varepsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɛ')"/></xsl:call-template></xsl:when> <!--/varepsilon --> + <xsl:when test="starts-with($content,'˙')"><xsl:value-of select="'\dot{}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '˙')"/></xsl:call-template></xsl:when> <!--/DiacriticalDot --> + <!-- ====================================================================== --> +@@ -22,51 +61,324 @@ + C1 Controls and Latin-1 Supplement + Range: 0080-00FF + http://www.unicode.org/charts/PDF/U0080.pdf --> +-<!-- ====================================================================== --> ++<!-- ====================================================================== --> ++ <xsl:when test="starts-with($content,'¡')"><xsl:value-of select="'\textexclamdown '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '¡')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'¢')"><xsl:value-of select="'\mbox{\textcent}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '¢')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'£')"><xsl:value-of select="'\pounds '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '£')"/></xsl:call-template></xsl:when> <!--pound sign --> ++ <xsl:when test="starts-with($content,'¤')"><xsl:value-of select="'\mbox{\textcurrency}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '¤')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'¥')"><xsl:value-of select="'\yen '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '¥')"/></xsl:call-template></xsl:when> <!--/yen =yen sign --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'§')"><xsl:value-of select="'\S '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '§')"/></xsl:call-template></xsl:when> <!--section sign --> ++ <xsl:when test="starts-with($content,'¨')"><xsl:value-of select="'\textasciidieresis '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '¨')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'©')"><xsl:value-of select="'\copyright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '©')"/></xsl:call-template></xsl:when> <!--copyright sign --> ++ <xsl:when test="starts-with($content,'ª')"><xsl:value-of select="'\textordfeminine '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ª')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'«')"><xsl:value-of select="'\mbox{\guillemotleft}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '«')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'¬')"><xsl:value-of select="'\neg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '¬')"/></xsl:call-template></xsl:when> <!--/neg /lnot =not sign --> ++ <xsl:when test="starts-with($content,'­')"><xsl:value-of select="'\- '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '­')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'®')"><xsl:value-of select="'\circledR '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '®')"/></xsl:call-template></xsl:when> <!--/circledR =registered sign --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'¯')"><xsl:value-of select="'\textasciimacron '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '¯')"/></xsl:call-template></xsl:when> ++ <!-- Note: The degree sign is not supported by WikiMedia. Instead of "^\circ" (as supposed by the WikiMedia TeX help), simply \circ is used, because this is what the OOo math editor displays (bug?). --> ++ <xsl:when test="starts-with($content,'°')"><xsl:value-of select="'\circ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '°')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'±')"><xsl:value-of select="'\pm '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '±')"/></xsl:call-template></xsl:when> <!--/pm B: =plus-or-minus sign --> +- <xsl:when test="starts-with($content,'µ')"><xsl:value-of select="'\mu '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'µ')"/></xsl:call-template></xsl:when> <!--=micro sign --> ++ <xsl:when test="starts-with($content,'²')"><xsl:value-of select="'{^2}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '²')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'³')"><xsl:value-of select="'{^3}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '³')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'´')"><xsl:value-of select="'\textasciiacute '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '´')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'µ')"><xsl:value-of select="'\mathrm{\mu}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'µ')"/></xsl:call-template></xsl:when> <!--=micro sign --> + <xsl:when test="starts-with($content,'¶')"><xsl:value-of select="'\P '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '¶')"/></xsl:call-template></xsl:when> <!--pilcrow (paragraph sign) --> ++ <xsl:when test="starts-with($content,'·')"><xsl:value-of select="'\cdotp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '·')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'¸')"><xsl:value-of select="'\mbox{\c{}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '¸')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'¹')"><xsl:value-of select="'{^1}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '¹')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'º')"><xsl:value-of select="'\textordmasculine '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'º')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'»')"><xsl:value-of select="'\mbox{\guillemotright}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '»')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'À')"><xsl:value-of select="'\grave{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'À')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Á')"><xsl:value-of select="'\acute{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Á')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Â')"><xsl:value-of select="'\hat{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Â')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ã')"><xsl:value-of select="'\tilde{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ã')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ä')"><xsl:value-of select="'\ddot{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ä')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'Å')"><xsl:value-of select="'\AA '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Å')"/></xsl:call-template></xsl:when> <!--capital A, ring --> <!-- invalid in math mode --> + <xsl:when test="starts-with($content,'Æ')"><xsl:value-of select="'\AE '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Æ')"/></xsl:call-template></xsl:when> <!--capital AE diphthong (ligature) --> <!-- invalid in math mode --> ++ <xsl:when test="starts-with($content,'Ç')"><xsl:value-of select="'\mbox{\c{C}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ç')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'È')"><xsl:value-of select="'\grave{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'È')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'É')"><xsl:value-of select="'\acute{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'É')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ê')"><xsl:value-of select="'\hat{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ê')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ë')"><xsl:value-of select="'\ddot{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ë')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ì')"><xsl:value-of select="'\grave{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ì')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Í')"><xsl:value-of select="'\acute{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Í')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Î')"><xsl:value-of select="'\hat{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Î')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ï')"><xsl:value-of select="'\ddot{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ï')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ð')"><xsl:value-of select="'\DH '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ð')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ñ')"><xsl:value-of select="'\tilde{N}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ñ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ò')"><xsl:value-of select="'\grave{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ò')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ó')"><xsl:value-of select="'\acute{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ó')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ô')"><xsl:value-of select="'\hat{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ô')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Õ')"><xsl:value-of select="'\tilde{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Õ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ö')"><xsl:value-of select="'\ddot{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ö')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'×')"><xsl:value-of select="'\times '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '×')"/></xsl:call-template></xsl:when> <!--/times B: =multiply sign --> ++ <xsl:when test="starts-with($content,'Ø')"><xsl:value-of select="'\O '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ø')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ù')"><xsl:value-of select="'\grave{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ù')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ú')"><xsl:value-of select="'\acute{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ú')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Û')"><xsl:value-of select="'\hat{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Û')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ü')"><xsl:value-of select="'\ddot{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ü')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ý')"><xsl:value-of select="'\acute{Y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ý')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Þ')"><xsl:value-of select="'\TH '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Þ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ß')"><xsl:value-of select="'\ss '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ß')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'à')"><xsl:value-of select="'\grave{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'à')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'á')"><xsl:value-of select="'\acute{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'á')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'â')"><xsl:value-of select="'\hat{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'â')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ã')"><xsl:value-of select="'\tilde{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ã')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ä')"><xsl:value-of select="'\ddot{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ä')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'å')"><xsl:value-of select="'\aa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'å')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'æ')"><xsl:value-of select="'\ae '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'æ')"/></xsl:call-template></xsl:when> <!--small ae diphthong (ligature) --> <!-- invalid in math mode --> +- ++ <xsl:when test="starts-with($content,'ç')"><xsl:value-of select="'\mbox{\c{c}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ç')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'è')"><xsl:value-of select="'\grave{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'è')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'é')"><xsl:value-of select="'\acute{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'é')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ê')"><xsl:value-of select="'\hat{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ê')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ë')"><xsl:value-of select="'\ddot{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ë')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ì')"><xsl:value-of select="'\grave{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ì')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'í')"><xsl:value-of select="'\acute{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'í')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'î')"><xsl:value-of select="'\hat{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'î')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ï')"><xsl:value-of select="'\ddot{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ï')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ð')"><xsl:value-of select="'\eth '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ð')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ñ')"><xsl:value-of select="'\tilde{n}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ñ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ò')"><xsl:value-of select="'\grave{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ò')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ó')"><xsl:value-of select="'\acute{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ó')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ô')"><xsl:value-of select="'\hat{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ô')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'õ')"><xsl:value-of select="'\tilde{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'õ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ö')"><xsl:value-of select="'\ddot{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ö')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'÷')"><xsl:value-of select="'\div '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '÷')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ø')"><xsl:value-of select="'\o '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ø')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ù')"><xsl:value-of select="'\grave{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ù')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ú')"><xsl:value-of select="'\acute{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ú')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'û')"><xsl:value-of select="'\hat{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'û')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ü')"><xsl:value-of select="'\ddot{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ü')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ý')"><xsl:value-of select="'\acute{y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ý')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'þ')"><xsl:value-of select="'\th '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'þ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ÿ')"><xsl:value-of select="'\ddot{y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ÿ')"/></xsl:call-template></xsl:when> ++<!-- ====================================================================== --> ++<!-- Unicode 3.2 ++ --> ++<!-- ====================================================================== --> ++<xsl:when test="starts-with($content,'Ā')"><xsl:value-of select="'\bar{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ā')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ā')"><xsl:value-of select="'\bar{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ā')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ă')"><xsl:value-of select="'\breve{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ă')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ă')"><xsl:value-of select="'\u{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ă')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ć')"><xsl:value-of select="'\acute{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ć')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ć')"><xsl:value-of select="'\acute{c}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ć')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ĉ')"><xsl:value-of select="'\hat{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ĉ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ĉ')"><xsl:value-of select="'\hat{c}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ĉ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ċ')"><xsl:value-of select="'\dot{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ċ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ċ')"><xsl:value-of select="'\dot{c}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ċ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Č')"><xsl:value-of select="'\check{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Č')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'č')"><xsl:value-of select="'\check{c}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'č')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ď')"><xsl:value-of select="'\check{D}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ď')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ď')"><xsl:value-of select="'\check{d}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ď')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ē')"><xsl:value-of select="'\bar{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ē')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ē')"><xsl:value-of select="'\bar{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ē')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ĕ')"><xsl:value-of select="'\breve{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ĕ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ĕ')"><xsl:value-of select="'\breve{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ĕ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ė')"><xsl:value-of select="'\dot{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ė')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ė')"><xsl:value-of select="'\dot{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ė')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ę')"><xsl:value-of select="'\k{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ę')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ě')"><xsl:value-of select="'\check{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ě')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ě')"><xsl:value-of select="'\check{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ě')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ĝ')"><xsl:value-of select="'\hat{G}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ĝ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ĝ')"><xsl:value-of select="'\hat{g}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ĝ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ğ')"><xsl:value-of select="'\breve{G}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ğ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ğ')"><xsl:value-of select="'\breve{g}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ğ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ġ')"><xsl:value-of select="'\dot{G}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ġ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ġ')"><xsl:value-of select="'\dot{g}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ġ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ģ')"><xsl:value-of select="'\mbox{\c{G}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ģ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ģ')"><xsl:value-of select="'\mbox{\c{g}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ģ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ĥ')"><xsl:value-of select="'\hat{H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ĥ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ĥ')"><xsl:value-of select="'\hat{h}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ĥ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ħ')"><xsl:value-of select="'\Elzxh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ħ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ĩ')"><xsl:value-of select="'\tilde{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ĩ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ĩ')"><xsl:value-of select="'\tilde{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ĩ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ī')"><xsl:value-of select="'\bar{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ī')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ī')"><xsl:value-of select="'\bar{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ī')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ĭ')"><xsl:value-of select="'\breve{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ĭ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ĭ')"><xsl:value-of select="'\breve{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ĭ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'İ')"><xsl:value-of select="'\dot{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'İ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ı')"><xsl:value-of select="'\imath '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ı')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ĵ')"><xsl:value-of select="'\hat{J}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ĵ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ĵ')"><xsl:value-of select="'\hat{\jmath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ĵ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ķ')"><xsl:value-of select="'\mbox{\c{K}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ķ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ķ')"><xsl:value-of select="'\mbox{\c{k}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ķ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ĺ')"><xsl:value-of select="'\acute{L}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ĺ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ĺ')"><xsl:value-of select="'\acute{l}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ĺ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ļ')"><xsl:value-of select="'\mbox{\c{L}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ļ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ļ')"><xsl:value-of select="'\mbox{\c{l}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ļ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ľ')"><xsl:value-of select="'\check{L}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ľ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ľ')"><xsl:value-of select="'\check{l}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ľ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ł')"><xsl:value-of select="'\L '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ł')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ł')"><xsl:value-of select="'\l '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ł')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ń')"><xsl:value-of select="'\acute{N}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ń')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ń')"><xsl:value-of select="'\acute{n}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ń')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ņ')"><xsl:value-of select="'\mbox{\c{N}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ņ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ņ')"><xsl:value-of select="'\mbox{\c{n}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ņ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ň')"><xsl:value-of select="'\check{N}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ň')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ň')"><xsl:value-of select="'\check{n}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ň')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ō')"><xsl:value-of select="'\bar{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ō')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ō')"><xsl:value-of select="'\bar{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ō')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ŏ')"><xsl:value-of select="'\breve{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ŏ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ŏ')"><xsl:value-of select="'\breve{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ŏ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ő')"><xsl:value-of select="'\mbox{\H{O}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ő')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ő')"><xsl:value-of select="'\mbox{\H{o}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ő')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Œ')"><xsl:value-of select="'\OE '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Œ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'œ')"><xsl:value-of select="'\oe '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'œ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ŕ')"><xsl:value-of select="'\acute{R}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ŕ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ŕ')"><xsl:value-of select="'\acute{r}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ŕ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ŗ')"><xsl:value-of select="'\mbox{\c{R}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ŗ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ŗ')"><xsl:value-of select="'\mbox{\c{r}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ŗ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ř')"><xsl:value-of select="'\check{R}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ř')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ř')"><xsl:value-of select="'\check{r}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ř')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ś')"><xsl:value-of select="'\acute{S}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ś')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ś')"><xsl:value-of select="'\acute{s}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ś')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ŝ')"><xsl:value-of select="'\hat{S}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ŝ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ŝ')"><xsl:value-of select="'\hat{s}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ŝ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ş')"><xsl:value-of select="'\mbox{\c{S}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ş')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ş')"><xsl:value-of select="'\mbox{\c{s}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ş')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Š')"><xsl:value-of select="'\check{S}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Š')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'š')"><xsl:value-of select="'\check{s}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'š')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ţ')"><xsl:value-of select="'\mbox{\c{T}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ţ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ţ')"><xsl:value-of select="'\mbox{\c{t}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ţ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ť')"><xsl:value-of select="'\check{T}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ť')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ť')"><xsl:value-of select="'\check{t}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ť')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ũ')"><xsl:value-of select="'\tilde{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ũ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ũ')"><xsl:value-of select="'\tilde{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ũ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ū')"><xsl:value-of select="'\bar{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ū')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ū')"><xsl:value-of select="'\bar{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ū')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ŭ')"><xsl:value-of select="'\breve{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ŭ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ŭ')"><xsl:value-of select="'\breve{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ŭ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ů')"><xsl:value-of select="'\mathring{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ů')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ů')"><xsl:value-of select="'\mathring{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ů')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ű')"><xsl:value-of select="'\mbox{\H{U}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ű')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ű')"><xsl:value-of select="'\mbox{\H{u}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ű')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ų')"><xsl:value-of select="'\k{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ų')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ŵ')"><xsl:value-of select="'\hat{W}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ŵ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ŵ')"><xsl:value-of select="'\hat{w}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ŵ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ŷ')"><xsl:value-of select="'\hat{Y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ŷ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ŷ')"><xsl:value-of select="'\hat{y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ŷ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ÿ')"><xsl:value-of select="'\ddot{Y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ÿ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ź')"><xsl:value-of select="'\acute{Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ź')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ź')"><xsl:value-of select="'\acute{z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ź')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ż')"><xsl:value-of select="'\dot{Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ż')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ż')"><xsl:value-of select="'\dot{z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ż')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ž')"><xsl:value-of select="'\check{Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ž')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ž')"><xsl:value-of select="'\check{z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ž')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ƒ')"><xsl:value-of select="'f'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ƒ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ƪ')"><xsl:value-of select="'\eth '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ƪ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ǵ')"><xsl:value-of select="'\acute{g}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ǵ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɐ')"><xsl:value-of select="'\Elztrna '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɐ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɒ')"><xsl:value-of select="'\Elztrnsa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɒ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɔ')"><xsl:value-of select="'\Elzopeno '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɔ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɖ')"><xsl:value-of select="'\Elzrtld '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɖ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ə')"><xsl:value-of select="'\Elzschwa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ə')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɛ')"><xsl:value-of select="'\varepsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɛ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɣ')"><xsl:value-of select="'\Elzpgamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɣ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɤ')"><xsl:value-of select="'\Elzpbgam '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɤ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɥ')"><xsl:value-of select="'\Elztrnh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɥ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɬ')"><xsl:value-of select="'\Elzbtdl '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɬ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɭ')"><xsl:value-of select="'\Elzrtll '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɭ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɯ')"><xsl:value-of select="'\Elztrnm '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɯ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɰ')"><xsl:value-of select="'\Elztrnmlr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɰ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɱ')"><xsl:value-of select="'\Elzltlmr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɱ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɳ')"><xsl:value-of select="'\Elzrtln '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɳ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɷ')"><xsl:value-of select="'\Elzclomeg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɷ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɹ')"><xsl:value-of select="'\Elztrnr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɹ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɺ')"><xsl:value-of select="'\Elztrnrl '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɺ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɻ')"><xsl:value-of select="'\Elzrttrnr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɻ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɼ')"><xsl:value-of select="'\Elzrl '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɼ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɽ')"><xsl:value-of select="'\Elzrtlr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɽ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ɾ')"><xsl:value-of select="'\Elzfhr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ɾ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʂ')"><xsl:value-of select="'\Elzrtls '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʂ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʃ')"><xsl:value-of select="'\Elzesh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʃ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʇ')"><xsl:value-of select="'\Elztrnt '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʇ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʈ')"><xsl:value-of select="'\Elzrtlt '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʈ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʊ')"><xsl:value-of select="'\Elzpupsil '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʊ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʋ')"><xsl:value-of select="'\Elzpscrv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʋ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʌ')"><xsl:value-of select="'\Elzinvv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʌ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʍ')"><xsl:value-of select="'\Elzinvw '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʍ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʎ')"><xsl:value-of select="'\Elztrny '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʎ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʐ')"><xsl:value-of select="'\Elzrtlz '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʐ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʒ')"><xsl:value-of select="'\Elzyogh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʒ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʔ')"><xsl:value-of select="'\Elzglst '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʔ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʕ')"><xsl:value-of select="'\Elzreglst '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʕ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʖ')"><xsl:value-of select="'\Elzinglst '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʖ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʤ')"><xsl:value-of select="'\Elzdyogh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʤ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ʧ')"><xsl:value-of select="'\Elztesh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʧ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'ʼ')"><xsl:value-of select="'\rasp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ʼ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ˈ')"><xsl:value-of select="'\Elzverts '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ˈ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ˌ')"><xsl:value-of select="'\Elzverti '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ˌ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ː')"><xsl:value-of select="'\Elzlmrk '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ː')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ˑ')"><xsl:value-of select="'\Elzhlmrk '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ˑ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'˒')"><xsl:value-of select="'\Elzsbrhr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '˒')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'˓')"><xsl:value-of select="'\Elzsblhr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '˓')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'˔')"><xsl:value-of select="'\Elzrais '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '˔')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'˕')"><xsl:value-of select="'\Elzlow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '˕')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'˘')"><xsl:value-of select="'\u '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '˘')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'˙')"><xsl:value-of select="'\dot{}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '˙')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'˚')"><xsl:value-of select="'\mathring{}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '˚')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'˛')"><xsl:value-of select="'\mbox{\k{}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '˛')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'˝')"><xsl:value-of select="'\mbox{\H{}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '˝')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'̀')"><xsl:value-of select="'\grave '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̀')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'́')"><xsl:value-of select="'\acute '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '́')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'̂')"><xsl:value-of select="'\hat '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̂')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'̃')"><xsl:value-of select="'\tilde '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̃')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'̄')"><xsl:value-of select="'\bar '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̄')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'̆')"><xsl:value-of select="'\breve '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̆')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'̇')"><xsl:value-of select="'\dot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̇')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'̈')"><xsl:value-of select="'\ddot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̈')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'̊')"><xsl:value-of select="'\ocirc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̊')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'̋')"><xsl:value-of select="'\H '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̋')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'̌')"><xsl:value-of select="'\check '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̌')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'̡')"><xsl:value-of select="'\Elzpalh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̡')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'̪')"><xsl:value-of select="'\Elzsbbrg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '̪')"/></xsl:call-template></xsl:when> + <!-- ====================================================================== --> + <!-- Unicode 3.2 + Greek + Range: 0370-03FF + http://www.unicode.org/charts/PDF/U0370.pdf --> +-<!-- ====================================================================== --> +- <xsl:when test="starts-with($content,'Α')"><xsl:value-of select="'{\rm A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Α')"/></xsl:call-template></xsl:when> <!--greek capital letter alpha --> +- <xsl:when test="starts-with($content,'Β')"><xsl:value-of select="'{\rm B}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Β')"/></xsl:call-template></xsl:when> <!-- greek capital letter beta --> +- <xsl:when test="starts-with($content,'Γ')"><xsl:value-of select="'\Gamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Γ')"/></xsl:call-template></xsl:when> <!--/Gamma capital Gamma, Greek --> +- <xsl:when test="starts-with($content,'Δ')"><xsl:value-of select="'\Delta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Δ')"/></xsl:call-template></xsl:when> <!--/Delta capital Delta, Greek --> +- <xsl:when test="starts-with($content,'Ε')"><xsl:value-of select="'{\rm E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ε')"/></xsl:call-template></xsl:when> <!-- greek capital letter epsilon --> +- <xsl:when test="starts-with($content,'Ζ')"><xsl:value-of select="'{\rm Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ζ')"/></xsl:call-template></xsl:when> <!-- greek capital letter zeta --> +- <xsl:when test="starts-with($content,'Η')"><xsl:value-of select="'{\rm H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Η')"/></xsl:call-template></xsl:when> <!-- greek capital letter eta --> +- <xsl:when test="starts-with($content,'Θ')"><xsl:value-of select="'\Theta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Θ')"/></xsl:call-template></xsl:when> <!--/Theta capital Theta, Greek --> +- <xsl:when test="starts-with($content,'Ι')"><xsl:value-of select="'{\rm I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ι')"/></xsl:call-template></xsl:when> <!-- greek capital letter iota --> +- <xsl:when test="starts-with($content,'Κ')"><xsl:value-of select="'{\rm K}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Κ')"/></xsl:call-template></xsl:when> <!-- greek capital letter kappa --> +- <xsl:when test="starts-with($content,'Λ')"><xsl:value-of select="'\Lambda '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Λ')"/></xsl:call-template></xsl:when> <!--/Lambda capital Lambda, Greek --> +- <xsl:when test="starts-with($content,'Μ')"><xsl:value-of select="'{\rm M}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Μ')"/></xsl:call-template></xsl:when> <!-- greek capital letter mu --> +- <xsl:when test="starts-with($content,'Ν')"><xsl:value-of select="'{\rm N}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ν')"/></xsl:call-template></xsl:when> <!-- greek capital letter nu --> +- <xsl:when test="starts-with($content,'Ξ')"><xsl:value-of select="'\Xi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ξ')"/></xsl:call-template></xsl:when> <!--/Xi capital Xi, Greek --> +- <xsl:when test="starts-with($content,'Ο')"><xsl:value-of select="'{\rm O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ο')"/></xsl:call-template></xsl:when> <!-- greek capital letter omicron --> +- <xsl:when test="starts-with($content,'Π')"><xsl:value-of select="'\Pi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Π')"/></xsl:call-template></xsl:when> <!--/Pi capital Pi, Greek --> +- <xsl:when test="starts-with($content,'Ρ')"><xsl:value-of select="'{\rm P}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ρ')"/></xsl:call-template></xsl:when> <!-- greek capital letter rho --> +- <xsl:when test="starts-with($content,'Σ')"><xsl:value-of select="'\Sigma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Σ')"/></xsl:call-template></xsl:when> <!--/Sigma capital Sigma, Greek --> +- <xsl:when test="starts-with($content,'Τ')"><xsl:value-of select="'{\rm T}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Τ')"/></xsl:call-template></xsl:when> <!-- greek capital letter tau --> +- <xsl:when test="starts-with($content,'Υ')"><xsl:value-of select="'{\rm Y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Υ')"/></xsl:call-template></xsl:when> <!-- greek capital letter upsilon --> +- <xsl:when test="starts-with($content,'Φ')"><xsl:value-of select="'\Phi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Φ')"/></xsl:call-template></xsl:when> <!--/Phi capital Phi, Greek --> +- <xsl:when test="starts-with($content,'Χ')"><xsl:value-of select="'{\rm X}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Χ')"/></xsl:call-template></xsl:when> <!-- greek capital letter chi --> +- <xsl:when test="starts-with($content,'Ψ')"><xsl:value-of select="'\Psi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ψ')"/></xsl:call-template></xsl:when> <!--/Psi capital Psi, Greek --> +- <xsl:when test="starts-with($content,'Ω')"><xsl:value-of select="'\Omega '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ω')"/></xsl:call-template></xsl:when> <!--/Omega capital Omega, Greek --> ++<!-- ====================================================================== --> ++<xsl:when test="starts-with($content,'Ά')"><xsl:value-of select="'\acute{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ά')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Έ')"><xsl:value-of select="'\acute{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Έ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ή')"><xsl:value-of select="'\grave{H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ή')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ί')"><xsl:value-of select="concat('\mathrm{',$apos,'I}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ί')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ό')"><xsl:value-of select="concat('\mathrm{',$apos,'O}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ό')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ύ')"><xsl:value-of select="concat('\mathrm{',$apos,'Y}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ύ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ώ')"><xsl:value-of select="concat('\mathrm{',$apos,'\Omega}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ώ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ΐ')"><xsl:value-of select="'\acute{\ddot{\iota}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ΐ')"/></xsl:call-template></xsl:when> ++ ++<xsl:when test="starts-with($content,'Α')"><xsl:value-of select="'\Alpha '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Α')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Β')"><xsl:value-of select="'\Beta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Β')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Γ')"><xsl:value-of select="'\Gamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Γ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Δ')"><xsl:value-of select="'\Delta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Δ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ε')"><xsl:value-of select="'\Epsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ε')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ζ')"><xsl:value-of select="'\Zeta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ζ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Η')"><xsl:value-of select="'\Eta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Η')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Θ')"><xsl:value-of select="'\Theta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Θ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ι')"><xsl:value-of select="'\Iota '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ι')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Κ')"><xsl:value-of select="'\Kappa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Κ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Λ')"><xsl:value-of select="'\Lambda '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Λ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Μ')"><xsl:value-of select="'M'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Μ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ν')"><xsl:value-of select="'N'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ν')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ξ')"><xsl:value-of select="'\Xi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ξ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ο')"><xsl:value-of select="'O'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ο')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Π')"><xsl:value-of select="'\Pi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Π')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ρ')"><xsl:value-of select="'\Rho '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ρ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Σ')"><xsl:value-of select="'\Sigma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Σ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Τ')"><xsl:value-of select="'\Tau '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Τ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Υ')"><xsl:value-of select="'\Upsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Υ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Φ')"><xsl:value-of select="'\Phi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Φ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Χ')"><xsl:value-of select="'\Chi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Χ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ψ')"><xsl:value-of select="'\Psi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ψ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ω')"><xsl:value-of select="'\Omega '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ω')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'Ϊ')"><xsl:value-of select="'\mathrm{\ddot{I}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ϊ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ϋ')"><xsl:value-of select="'\mathrm{\ddot{Y}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ϋ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ά')"><xsl:value-of select="'\acute{\alpha}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ά')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'έ')"><xsl:value-of select="'\acute{\epsilon}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'έ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ή')"><xsl:value-of select="'\acute{\eta}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ή')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ί')"><xsl:value-of select="'\acute{\iota}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ί')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ΰ')"><xsl:value-of select="'\acute{\ddot{\upsilon}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ΰ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'α')"><xsl:value-of select="'\alpha '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'α')"/></xsl:call-template></xsl:when> <!--/alpha small alpha, Greek --> + <xsl:when test="starts-with($content,'β')"><xsl:value-of select="'\beta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'β')"/></xsl:call-template></xsl:when> <!--/beta small beta, Greek --> + <xsl:when test="starts-with($content,'γ')"><xsl:value-of select="'\gamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'γ')"/></xsl:call-template></xsl:when> <!--/gamma small gamma, Greek --> +@@ -92,60 +404,143 @@ + <xsl:when test="starts-with($content,'χ')"><xsl:value-of select="'\chi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'χ')"/></xsl:call-template></xsl:when> <!--/chi small chi, Greek --> + <xsl:when test="starts-with($content,'ψ')"><xsl:value-of select="'\psi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ψ')"/></xsl:call-template></xsl:when> <!--/psi small psi, Greek --> + <xsl:when test="starts-with($content,'ω')"><xsl:value-of select="'\omega '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ω')"/></xsl:call-template></xsl:when> <!--/omega small omega, Greek --> ++ <xsl:when test="starts-with($content,'ϊ')"><xsl:value-of select="'\ddot{\iota}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϊ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ϋ')"><xsl:value-of select="'\ddot{\upsilon}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϋ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ό')"><xsl:value-of select="'\acute{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ό')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ύ')"><xsl:value-of select="'\acute{\upsilon}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ύ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ώ')"><xsl:value-of select="'\acute{\omega}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ώ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'ϑ')"><xsl:value-of select="'\vartheta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϑ')"/></xsl:call-template></xsl:when> <!--/vartheta - curly or open theta --> + <xsl:when test="starts-with($content,'ϒ')"><xsl:value-of select="'\Upsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϒ')"/></xsl:call-template></xsl:when> <!--/Upsilon capital Upsilon, Greek --> +- <xsl:when test="starts-with($content,'ϕ')"><xsl:value-of select="'\varphi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϕ')"/></xsl:call-template></xsl:when> <!--/varphi - curly or open phi --> ++ <xsl:when test="starts-with($content,'ϕ')"><xsl:value-of select="'\phi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϕ')"/></xsl:call-template></xsl:when> <!--/varphi - curly or open phi --> + <xsl:when test="starts-with($content,'ϖ')"><xsl:value-of select="'\varpi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϖ')"/></xsl:call-template></xsl:when> <!--/varpi --> ++<xsl:when test="starts-with($content,'Ϛ')"><xsl:value-of select="'\Stigma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ϛ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ϝ')"><xsl:value-of select="'\Digamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ϝ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ϝ')"><xsl:value-of select="'\digamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϝ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ϟ')"><xsl:value-of select="'\Koppa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ϟ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Ϡ')"><xsl:value-of select="'\Sampi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ϡ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'ϰ')"><xsl:value-of select="'\varkappa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϰ')"/></xsl:call-template></xsl:when> <!--/varkappa --> + <xsl:when test="starts-with($content,'ϱ')"><xsl:value-of select="'\varrho '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϱ')"/></xsl:call-template></xsl:when> <!--/varrho --> +- ++<xsl:when test="starts-with($content,'ϵ')"><xsl:value-of select="'\epsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ϵ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'϶')"><xsl:value-of select="'\backepsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '϶')"/></xsl:call-template></xsl:when> + <!-- ====================================================================== --> + <!-- Unicode 3.2 + General Punctuation + Range: 2000-206F + http://www.unicode.org/charts/PDF/U2000.pdf --> + <!-- ====================================================================== --> +- <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\hspace{0.5em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> <!-- en space (1/2-em) --> +- <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\hspace{1em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> <!-- emsp - space of width 1em --> ++ <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\enspace "' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> <!-- en space (1/2-em) --> ++ <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\quad "' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> <!-- emsp - space of width 1em --> + <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\hspace{0.33em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> <!-- emsp13 - space of width 1/3 em --> +- <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\hspace{0.25em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> <!-- ThickSpace - space of width 1/4 em --> +- <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\hspace{0.17em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> <!-- ThinSpace - space of width 3/18 em --> ++ <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\thickspace "' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> <!-- ThickSpace - space of width 1/4 em --> ++ <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\hspace{0.166em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\hphantom{0}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\hphantom{,}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,' ')"><xsl:value-of select='"\thinspace "' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> <!-- ThinSpace - space of width 3/18 em --> ++ <xsl:when test="starts-with($content,' ')"><xsl:value-of select="'\hspace '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'​')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '​')"/></xsl:call-template></xsl:when> <!--zero width space --> ++ <xsl:when test="starts-with($content,'‐')"><xsl:value-of select="'-'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '‐')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'–')"><xsl:value-of select="'\endash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '–')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'—')"><xsl:value-of select="'\emdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '—')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'‖')"><xsl:value-of select="'\Vert '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '‖')"/></xsl:call-template></xsl:when> <!--/Vert dbl vertical bar --> ++ <xsl:when test="starts-with($content,'‘')"><xsl:value-of select="'\lq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '‘')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'’')"><xsl:value-of select="'\rq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '’')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'‛')"><xsl:value-of select="'\Elzreapos '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '‛')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'“')"><xsl:value-of select="'\textquotedblleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '“')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'”')"><xsl:value-of select="'\textquotedblright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '”')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'†')"><xsl:value-of select="'\dagger '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '†')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'‡')"><xsl:value-of select="'\ddager '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '‡')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'•')"><xsl:value-of select="'\bullet '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '•')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'…')"><xsl:value-of select="'\dots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '…')"/></xsl:call-template></xsl:when> <!--horizontal ellipsis = three dot leader --> + <xsl:when test="starts-with($content,'′')"><xsl:value-of select="'\prime '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '′')"/></xsl:call-template></xsl:when> <!--/prime prime or minute --> ++<xsl:when test="starts-with($content,'″')"><xsl:value-of select="concat('{',$apos,$apos,'}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '″')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'‴')"><xsl:value-of select="concat('{',$apos,$apos,$apos,'}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '‴')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'‵')"><xsl:value-of select="'\backprime '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '‵')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⁁')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⁁')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⁄')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⁄')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⁎')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⁎')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⁗')"><xsl:value-of select="concat($apos,$apos,$apos,$apos)" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⁗')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,' ')"><xsl:value-of select="'\mkern4mu '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'⁡')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⁡')"/></xsl:call-template></xsl:when> <!-- ApplyFunction --> + <xsl:when test="starts-with($content,'⁢')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⁢')"/></xsl:call-template></xsl:when> <!-- InvisibleTimes --> + <xsl:when test="starts-with($content,'⁣')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⁣')"/></xsl:call-template></xsl:when> <!-- InvisibleComma, used as a separator, e.g., in indices --> + <!-- ====================================================================== --> + <!-- Unicode 3.2 ++ --> ++<!-- ====================================================================== --> ++<xsl:when test="starts-with($content,'₧')"><xsl:value-of select="'\Elzpes'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '₧')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'€')"><xsl:value-of select="'\mbox{\texteuro}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '€')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⃛')"><xsl:value-of select="'\dddot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⃛')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⃜')"><xsl:value-of select="'\ddddot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⃜')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⃧')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⃧')"/></xsl:call-template></xsl:when> ++<!-- ====================================================================== --> ++<!-- Unicode 3.2 + Letterlike Symbols + Range: 2100-214F + http://www.unicode.org/charts/PDF/U2100.pdf --> + <!-- ====================================================================== --> ++<xsl:when test="starts-with($content,'ℂ')"><xsl:value-of select="'\mathbb{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℂ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ℊ')"><xsl:value-of select="'\mathscr{g}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℊ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'ℋ')"><xsl:value-of select="'\mathscr{H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℋ')"/></xsl:call-template></xsl:when> <!--H Hamiltonian --> ++ <xsl:when test="starts-with($content,'ℌ')"><xsl:value-of select="'\mathfrak{H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℌ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ℍ')"><xsl:value-of select="'\mathbb{H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℍ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ℎ')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℎ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'ℏ︀')"><xsl:value-of select="'\hbar '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℏ︀')"/></xsl:call-template></xsl:when> <!--/hbar - Planck's over 2pi --> + <xsl:when test="starts-with($content,'ℏ')"><xsl:value-of select="'\hslash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℏ')"/></xsl:call-template></xsl:when> <!--/hslash - variant Planck's over 2pi --> <!-- Required amssymb --> ++<xsl:when test="starts-with($content,'ℐ')"><xsl:value-of select="'\mathscr{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℐ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'ℑ')"><xsl:value-of select="'\Im '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℑ')"/></xsl:call-template></xsl:when> <!--/Im - imaginary --> ++<xsl:when test="starts-with($content,'ℒ')"><xsl:value-of select="'\mathscr{L}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℒ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'ℓ')"><xsl:value-of select="'\ell '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℓ')"/></xsl:call-template></xsl:when> <!--/ell - cursive small l --> + <xsl:when test="starts-with($content,'ℕ')"><xsl:value-of select="'\mathbb{N}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℕ')"/></xsl:call-template></xsl:when> <!--the semi-ring of natural numbers --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'№')"><xsl:value-of select="'\textnumero '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '№')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'℘')"><xsl:value-of select="'\wp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '℘')"/></xsl:call-template></xsl:when> <!--/wp - Weierstrass p --> + <xsl:when test="starts-with($content,'ℙ')"><xsl:value-of select="'\mathbb{P}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℙ')"/></xsl:call-template></xsl:when> <!--the prime natural numbers --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'ℚ')"><xsl:value-of select="'\mathbb{Q}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℚ')"/></xsl:call-template></xsl:when> <!--the field of rational numbers --> <!-- Required amssymb --> ++<xsl:when test="starts-with($content,'ℛ')"><xsl:value-of select="'\mathscr{R}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℛ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'ℜ')"><xsl:value-of select="'\Re '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℜ')"/></xsl:call-template></xsl:when> <!--/Re - real --> ++ <xsl:when test="starts-with($content,'ℝ')"><xsl:value-of select="'\mathbb{R}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℝ')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'℞')"><xsl:value-of select="'\Elzxrat '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '℞')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'ℤ')"><xsl:value-of select="'\mathbb{Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℤ')"/></xsl:call-template></xsl:when> <!--the ring of integers --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'Ω')"><xsl:value-of select="'\Omega '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Ω')"/></xsl:call-template></xsl:when> <!--ohm sign --> + <xsl:when test="starts-with($content,'℧')"><xsl:value-of select="'\mho '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '℧')"/></xsl:call-template></xsl:when> <!--/mho - conductance --> ++<xsl:when test="starts-with($content,'ℨ')"><xsl:value-of select="'\mathfrak{Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℨ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'℩')"><xsl:value-of select="'\ElsevierGlyph{2129}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '℩')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'Å')"><xsl:value-of select="'\AA'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'Å')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ℬ')"><xsl:value-of select="'\mathscr{B}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℬ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ℭ')"><xsl:value-of select="'\mathfrak{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℭ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ℯ')"><xsl:value-of select="'\mathscr{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℯ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ℰ')"><xsl:value-of select="'\mathscr{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℰ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ℱ')"><xsl:value-of select="'\mathscr{F}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℱ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ℳ')"><xsl:value-of select="'\mathscr{M}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℳ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'ℴ')"><xsl:value-of select="'\mathscr{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℴ')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'ℵ')"><xsl:value-of select="'\aleph '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℵ')"/></xsl:call-template></xsl:when> <!--/aleph aleph, Hebrew --> + <xsl:when test="starts-with($content,'ℶ')"><xsl:value-of select="'\beth '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℶ')"/></xsl:call-template></xsl:when> <!--/beth - beth, Hebrew --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'ℷ')"><xsl:value-of select="'\gimel '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℷ')"/></xsl:call-template></xsl:when> <!--/gimel - gimel, Hebrew --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'ℸ')"><xsl:value-of select="'\daleth '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℸ')"/></xsl:call-template></xsl:when> <!--/daleth - daleth, Hebrew --> <!-- Required amssymb --> ++<xsl:when test="starts-with($content,'ℿ')"><xsl:value-of select="'\BbbPi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ℿ')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅀')"><xsl:value-of select="'\bbsum '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅀')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅁')"><xsl:value-of select="'\Game '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅁')"/></xsl:call-template></xsl:when> ++ + <xsl:when test="starts-with($content,'ⅅ')"><xsl:value-of select="'D'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ⅅ')"/></xsl:call-template></xsl:when> <!--D for use in differentials, e.g., within integrals --> + <xsl:when test="starts-with($content,'ⅆ')"><xsl:value-of select="'d'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ⅆ')"/></xsl:call-template></xsl:when> <!--d for use in differentials, e.g., within integrals --> + <xsl:when test="starts-with($content,'ⅇ')"><xsl:value-of select="'e'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ⅇ')"/></xsl:call-template></xsl:when> <!--e use for the exponential base of the natural logarithms --> + <xsl:when test="starts-with($content,'ⅈ')"><xsl:value-of select="'i'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ⅈ')"/></xsl:call-template></xsl:when> <!--i for use as a square root of -1 --> + <xsl:when test="starts-with($content,'ⅉ')"><xsl:value-of select="'j'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ⅉ')"/></xsl:call-template></xsl:when> +- ++<!-- ====================================================================== --> ++<!-- Unicode 3.2 ++ --> ++<!-- ====================================================================== --> ++<xsl:when test="starts-with($content,'⅓')"><xsl:value-of select="'\textfrac{1}{3}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅓')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅔')"><xsl:value-of select="'\textfrac{2}{3}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅔')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅕')"><xsl:value-of select="'\textfrac{1}{5}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅕')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅖')"><xsl:value-of select="'\textfrac{2}{5}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅖')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅗')"><xsl:value-of select="'\textfrac{3}{5}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅗')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅘')"><xsl:value-of select="'\textfrac{4}{5}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅘')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅙')"><xsl:value-of select="'\textfrac{1}{6}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅙')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅚')"><xsl:value-of select="'\textfrac{5}{6}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅚')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅛')"><xsl:value-of select="'\textfrac{1}{8}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅛')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅜')"><xsl:value-of select="'\textfrac{3}{8}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅜')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅝')"><xsl:value-of select="'\textfrac{5}{8}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅝')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⅞')"><xsl:value-of select="'\textfrac{7}{8}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⅞')"/></xsl:call-template></xsl:when> + <!-- ====================================================================== --> + <!-- Unicode 3.2 + Arrows +@@ -154,7 +549,7 @@ + <!-- ====================================================================== --> + <xsl:when test="starts-with($content,'←')"><xsl:value-of select="'\leftarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '←')"/></xsl:call-template></xsl:when> <!--/leftarrow /gets A: =leftward arrow --> + <xsl:when test="starts-with($content,'↑')"><xsl:value-of select="'\uparrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↑')"/></xsl:call-template></xsl:when> <!--/uparrow A: =upward arrow --> +- <xsl:when test="starts-with($content,'→')"><xsl:value-of select="'\to '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '→')"/></xsl:call-template></xsl:when> <!--/rightarrow /to A: =rightward arrow --> ++ <xsl:when test="starts-with($content,'→')"><xsl:value-of select="'\rightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '→')"/></xsl:call-template></xsl:when> <!--/rightarrow /to A: =rightward arrow --> + <xsl:when test="starts-with($content,'↓')"><xsl:value-of select="'\downarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↓')"/></xsl:call-template></xsl:when> <!--/downarrow A: =downward arrow --> + <xsl:when test="starts-with($content,'↔')"><xsl:value-of select="'\leftrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↔')"/></xsl:call-template></xsl:when> <!--/leftrightarrow A: l&r arrow --> + <xsl:when test="starts-with($content,'↕')"><xsl:value-of select="'\updownarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↕')"/></xsl:call-template></xsl:when> <!--/updownarrow A: up&down arrow --> +@@ -164,6 +559,7 @@ + <xsl:when test="starts-with($content,'↙')"><xsl:value-of select="'\swarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↙')"/></xsl:call-template></xsl:when> <!--/swarrow A: SW pointing arrow --> + <xsl:when test="starts-with($content,'↚')"><xsl:value-of select="'\nleftarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↚')"/></xsl:call-template></xsl:when> <!--/nleftarrow A: not left arrow --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'↛')"><xsl:value-of select="'\nrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↛')"/></xsl:call-template></xsl:when> <!--/nrightarrow A: not right arrow --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'↜')"><xsl:value-of select="'\leftsquigarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↜')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'↝')"><xsl:value-of select="'\rightsquigarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↝')"/></xsl:call-template></xsl:when> <!--/rightsquigarrow A: rt arrow-wavy --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'↞')"><xsl:value-of select="'\twoheadleftarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↞')"/></xsl:call-template></xsl:when> <!--/twoheadleftarrow A: --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'↠')"><xsl:value-of select="'\twoheadrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↠')"/></xsl:call-template></xsl:when> <!--/twoheadrightarrow A: --> <!-- Required amssymb --> +@@ -178,6 +574,7 @@ + <xsl:when test="starts-with($content,'↮')"><xsl:value-of select="'\nleftrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↮')"/></xsl:call-template></xsl:when> <!--/nleftrightarrow A: not l&r arrow --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'↰')"><xsl:value-of select="'\Lsh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↰')"/></xsl:call-template></xsl:when> <!--/Lsh A: --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'↱')"><xsl:value-of select="'\Rsh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↱')"/></xsl:call-template></xsl:when> <!--/Rsh A: --> <!-- Required amssymb --> ++<xsl:when test="starts-with($content,'↳')"><xsl:value-of select="'\ElsevierGlyph{21B3}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↳')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'↶')"><xsl:value-of select="'\curvearrowleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↶')"/></xsl:call-template></xsl:when> <!--/curvearrowleft A: left curved arrow --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'↷')"><xsl:value-of select="'\curvearrowright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↷')"/></xsl:call-template></xsl:when> <!--/curvearrowright A: rt curved arrow --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'↺')"><xsl:value-of select="'\circlearrowleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '↺')"/></xsl:call-template></xsl:when> <!--/circlearrowleft A: l arr in circle --> <!-- Required amssymb --> +@@ -191,6 +588,7 @@ + <xsl:when test="starts-with($content,'⇂')"><xsl:value-of select="'\downharpoonright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇂')"/></xsl:call-template></xsl:when> <!--/downharpoonright A: down harpoon-rt --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'⇃')"><xsl:value-of select="'\downharpoonleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇃')"/></xsl:call-template></xsl:when> <!--/downharpoonleft A: dn harpoon-left --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'⇄')"><xsl:value-of select="'\rightleftarrows '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇄')"/></xsl:call-template></xsl:when> <!--/rightleftarrows A: r arr over l arr --> <!-- Required amssymb --> ++<xsl:when test="starts-with($content,'⇅')"><xsl:value-of select="'\dblarrowupdown '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇅')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'⇆')"><xsl:value-of select="'\leftrightarrows '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇆')"/></xsl:call-template></xsl:when> <!--/leftrightarrows A: l arr over r arr --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'⇇')"><xsl:value-of select="'\leftleftarrows '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇇')"/></xsl:call-template></xsl:when> <!--/leftleftarrows A: two left arrows --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'⇈')"><xsl:value-of select="'\upuparrows '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇈')"/></xsl:call-template></xsl:when> <!--/upuparrows A: two up arrows --> <!-- Required amssymb --> +@@ -205,12 +603,16 @@ + <xsl:when test="starts-with($content,'⇑')"><xsl:value-of select="'\Uparrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇑')"/></xsl:call-template></xsl:when> <!--/Uparrow A: up dbl arrow --> + <xsl:when test="starts-with($content,'⇒')"><xsl:value-of select="'\Rightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇒')"/></xsl:call-template></xsl:when> <!--/Rightarrow A: implies --> + <xsl:when test="starts-with($content,'⇓')"><xsl:value-of select="'\Downarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇓')"/></xsl:call-template></xsl:when> <!--/Downarrow A: down dbl arrow --> +-<!-- <xsl:when test="starts-with($content,'⇔')"><xsl:value-of select="'\Leftrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇔')"/></xsl:call-template></xsl:when> /Leftrightarrow A: l&r dbl arrow --> +- <xsl:when test="starts-with($content,'⇔')"><xsl:value-of select="'\iff '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇔')"/></xsl:call-template></xsl:when> <!--/iff if and only if --> ++ <xsl:when test="starts-with($content,'⇔')"><xsl:value-of select="'\Leftrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇔')"/></xsl:call-template></xsl:when> <!--/Leftrightarrow A: l&r dbl arrow --> ++<!-- <xsl:when test="starts-with($content,'⇔')"><xsl:value-of select="'\iff '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇔')"/></xsl:call-template></xsl:when> /iff if and only if --> + <xsl:when test="starts-with($content,'⇕')"><xsl:value-of select="'\Updownarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇕')"/></xsl:call-template></xsl:when> <!--/Updownarrow A: up&down dbl arrow --> + <xsl:when test="starts-with($content,'⇚')"><xsl:value-of select="'\Lleftarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇚')"/></xsl:call-template></xsl:when> <!--/Lleftarrow A: left triple arrow --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'⇛')"><xsl:value-of select="'\Rrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇛')"/></xsl:call-template></xsl:when> <!--/Rrightarrow A: right triple arrow --> <!-- Required amssymb --> +- ++<xsl:when test="starts-with($content,'⇝')"><xsl:value-of select="'\rightsquigarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇝')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⇵')"><xsl:value-of select="'\DownArrowUpArrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇵')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⇽')"><xsl:value-of select="'\leftarrowtriangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇽')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⇾')"><xsl:value-of select="'\rightarrowtriangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇾')"/></xsl:call-template></xsl:when> ++<xsl:when test="starts-with($content,'⇿')"><xsl:value-of select="'\leftrightarrowtria* '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⇿')"/></xsl:call-template></xsl:when> + <!-- ====================================================================== --> + <!-- Unicode 3.2 + Mathematical Operators +@@ -224,7 +626,6 @@ + <xsl:when test="starts-with($content,'∄')"><xsl:value-of select="'\nexists '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∄')"/></xsl:call-template></xsl:when> <!--/nexists - negated exists --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'∅︀')"><xsl:value-of select="'\emptyset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∅︀')"/></xsl:call-template></xsl:when> <!--/emptyset - zero, slash --> + <xsl:when test="starts-with($content,'∅')"><xsl:value-of select="'\varnothing '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∅')"/></xsl:call-template></xsl:when> <!--/varnothing - circle, slash --> <!-- Required amssymb --> +-<!-- <xsl:when test="starts-with($content,'∆')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∆')"/></xsl:call-template></xsl:when>--> + <xsl:when test="starts-with($content,'∇')"><xsl:value-of select="'\nabla '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∇')"/></xsl:call-template></xsl:when> <!--/nabla del, Hamilton operator --> + <xsl:when test="starts-with($content,'∈')"><xsl:value-of select="'\in '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∈')"/></xsl:call-template></xsl:when> <!--/in R: set membership --> + <xsl:when test="starts-with($content,'∉')"><xsl:value-of select="'\notin '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∉')"/></xsl:call-template></xsl:when> <!--/notin N: negated set membership --> +@@ -236,7 +637,6 @@ + <xsl:when test="starts-with($content,'−')"><xsl:value-of select="'-'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '−')"/></xsl:call-template></xsl:when> <!--B: minus sign --> + <xsl:when test="starts-with($content,'∓')"><xsl:value-of select="'\mp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∓')"/></xsl:call-template></xsl:when> <!--/mp B: minus-or-plus sign --> + <xsl:when test="starts-with($content,'∔')"><xsl:value-of select="'\dotplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∔')"/></xsl:call-template></xsl:when> <!--/dotplus B: plus sign, dot above --> <!-- Required amssymb --> +-<!-- <xsl:when test="starts-with($content,'∕')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∕')"/></xsl:call-template></xsl:when>--> + <xsl:when test="starts-with($content,'∖')"><xsl:value-of select="'\setminus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∖')"/></xsl:call-template></xsl:when> <!--/setminus B: reverse solidus --> + <xsl:when test="starts-with($content,'∗')"><xsl:value-of select="'\ast '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∗')"/></xsl:call-template></xsl:when> <!--low asterisk --> + <xsl:when test="starts-with($content,'∘')"><xsl:value-of select="'\circ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∘')"/></xsl:call-template></xsl:when> <!--/circ B: composite function (small circle) --> +@@ -244,11 +644,11 @@ + <xsl:when test="starts-with($content,'√')"><xsl:value-of select="'\surd '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '√')"/></xsl:call-template></xsl:when> <!--/surd radical --> + <xsl:when test="starts-with($content,'∝')"><xsl:value-of select="'\propto '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∝')"/></xsl:call-template></xsl:when> <!--/propto R: is proportional to --> + <xsl:when test="starts-with($content,'∞')"><xsl:value-of select="'\infty '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∞')"/></xsl:call-template></xsl:when> <!--/infty infinity --> +-<!-- <xsl:when test="starts-with($content,'∟')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∟')"/></xsl:call-template></xsl:when> right (90 degree) angle --> ++ <xsl:when test="starts-with($content,'∟')"><xsl:value-of select="'\rightangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∟')"/></xsl:call-template></xsl:when> <!--/right (90 degree) angle --> + <xsl:when test="starts-with($content,'∠')"><xsl:value-of select="'\angle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∠')"/></xsl:call-template></xsl:when> <!--/angle - angle --> + <xsl:when test="starts-with($content,'∡')"><xsl:value-of select="'\measuredangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∡')"/></xsl:call-template></xsl:when> <!--/measuredangle - angle-measured --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'∢')"><xsl:value-of select="'\sphericalangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∢')"/></xsl:call-template></xsl:when><!--/sphericalangle angle-spherical --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'∣')"><xsl:value-of select="'\mid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∣')"/></xsl:call-template></xsl:when> <!--/mid R: --> ++ <xsl:when test="starts-with($content,'∣')"><xsl:value-of select="'|'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∣')"/></xsl:call-template></xsl:when> <!--/mid R: --> + <xsl:when test="starts-with($content,'∤︀')"><xsl:value-of select="'\nshortmid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∤︀')"/></xsl:call-template></xsl:when> <!--/nshortmid --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'∤')"><xsl:value-of select="'\nmid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∤')"/></xsl:call-template></xsl:when> <!--/nmid --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'∥')"><xsl:value-of select="'\parallel '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∥')"/></xsl:call-template></xsl:when> <!--/parallel R: parallel --> +@@ -262,95 +662,104 @@ + <xsl:when test="starts-with($content,'∬')"><xsl:value-of select="'\iint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∬')"/></xsl:call-template></xsl:when> <!--double integral operator --> <!-- Required amsmath --> + <xsl:when test="starts-with($content,'∭')"><xsl:value-of select="'\iiint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∭')"/></xsl:call-template></xsl:when> <!--/iiint triple integral operator --> <!-- Required amsmath --> + <xsl:when test="starts-with($content,'∮')"><xsl:value-of select="'\oint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∮')"/></xsl:call-template></xsl:when> <!--/oint L: contour integral operator --> +-<!-- <xsl:when test="starts-with($content,'∯')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∯')"/></xsl:call-template></xsl:when>--> +-<!-- <xsl:when test="starts-with($content,'∰')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∰')"/></xsl:call-template></xsl:when>--> +-<!-- <xsl:when test="starts-with($content,'∱')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∱')"/></xsl:call-template></xsl:when>--> +-<!-- <xsl:when test="starts-with($content,'∲')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∲')"/></xsl:call-template></xsl:when>--> +-<!-- <xsl:when test="starts-with($content,'∳')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∳')"/></xsl:call-template></xsl:when>--> ++ <xsl:when test="starts-with($content,'∯')"><xsl:value-of select="'\backslash oiint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∯')"/></xsl:call-template></xsl:when> <!-- \surfintegral --> ++ <xsl:when test="starts-with($content,'∰')"><xsl:value-of select="'\backslash oiiint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∰')"/></xsl:call-template></xsl:when> <!-- \volintegral --> ++ <xsl:when test="starts-with($content,'∱')"><xsl:value-of select="'\clwintegral '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∱')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'∲')"><xsl:value-of select="'\ElsevierGlyph{2232}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∲')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'∳')"><xsl:value-of select="'\ElsevierGlyph{2233}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∳')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'∴')"><xsl:value-of select="'\therefore '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∴')"/></xsl:call-template></xsl:when> <!--/therefore R: therefore --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'∵')"><xsl:value-of select="'\because '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∵')"/></xsl:call-template></xsl:when> <!--/because R: because --> <!-- Required amssymb --> + <!-- ? --> <xsl:when test="starts-with($content,'∶')"><xsl:value-of select="':'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∶')"/></xsl:call-template></xsl:when> <!--/ratio --> +-<!-- ? --> <xsl:when test="starts-with($content,'∷')"><xsl:value-of select="'\colon\colon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∷')"/></xsl:call-template></xsl:when> <!--/Colon, two colons --> +-<!-- ? --> <xsl:when test="starts-with($content,'∸')"><xsl:value-of select="'\dot{-}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∸')"/></xsl:call-template></xsl:when> <!--/dotminus B: minus sign, dot above --> ++ <xsl:when test="starts-with($content,'∷')"><xsl:value-of select="'\Colon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∷')"/></xsl:call-template></xsl:when> <!--/Colon, two colons --> ++ <xsl:when test="starts-with($content,'∸')"><xsl:value-of select="'\dotminus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∸')"/></xsl:call-template></xsl:when> <!--/dotminus B: minus sign, dot above --> + <!-- <xsl:when test="starts-with($content,'∹')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∹')"/></xsl:call-template></xsl:when> --> +-<!-- <xsl:when test="starts-with($content,'∺')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∺')"/></xsl:call-template></xsl:when> minus with four dots, geometric properties --> +-<!-- <xsl:when test="starts-with($content,'∻')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∻')"/></xsl:call-template></xsl:when> homothetic --> ++ <xsl:when test="starts-with($content,'∺')"><xsl:value-of select="'\mathbin{{:}\!\!{-}\!\!{:}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∺')"/></xsl:call-template></xsl:when> <!-- minus with four dots, geometric properties --> ++ <xsl:when test="starts-with($content,'∻')"><xsl:value-of select="'\kernelcontraction '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∻')"/></xsl:call-template></xsl:when> <!-- homothetic --> + <xsl:when test="starts-with($content,'∼')"><xsl:value-of select="'\sim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∼')"/></xsl:call-template></xsl:when> <!--/sim R: similar --> + <xsl:when test="starts-with($content,'∽')"><xsl:value-of select="'\backsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∽')"/></xsl:call-template></xsl:when> <!--/backsim R: reverse similar --> <!-- Required amssymb --> +-<!-- <xsl:when test="starts-with($content,'∾')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∾')"/></xsl:call-template></xsl:when> most positive --> ++ <xsl:when test="starts-with($content,'∾')"><xsl:value-of select="'\lazysinv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∾')"/></xsl:call-template></xsl:when> <!-- most positive --> + <!-- <xsl:when test="starts-with($content,'∿')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '∿')"/></xsl:call-template></xsl:when> ac current --> + <xsl:when test="starts-with($content,'≀')"><xsl:value-of select="'\wr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≀')"/></xsl:call-template></xsl:when> <!--/wr B: wreath product --> + <xsl:when test="starts-with($content,'≁')"><xsl:value-of select="'\nsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≁')"/></xsl:call-template></xsl:when> <!--/nsim N: not similar --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≂̸')"><xsl:value-of select="'\neqsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≂̸')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'≂')"><xsl:value-of select="'\eqsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≂')"/></xsl:call-template></xsl:when> <!--/esim R: equals, similar --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'≃')"><xsl:value-of select="'\simeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≃')"/></xsl:call-template></xsl:when> <!--/simeq R: similar, equals --> +- <xsl:when test="starts-with($content,'≄')"><xsl:value-of select="'\not\simeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≄')"/></xsl:call-template></xsl:when> <!--/nsimeq N: not similar, equals --> ++ <xsl:when test="starts-with($content,'≄')"><xsl:value-of select="'\nsime '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≄')"/></xsl:call-template></xsl:when> <!--/nsimeq N: not similar, equals --> + <xsl:when test="starts-with($content,'≅')"><xsl:value-of select="'\cong '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≅')"/></xsl:call-template></xsl:when> <!--/cong R: congruent with --> +-<!-- <xsl:when test="starts-with($content,'≆')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≆')"/></xsl:call-template></xsl:when> similar, not equals --> ++ <xsl:when test="starts-with($content,'≆')"><xsl:value-of select="'\approxnotequal '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≆')"/></xsl:call-template></xsl:when><!-- similar, not equals --> + <xsl:when test="starts-with($content,'≇')"><xsl:value-of select="'\ncong '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≇')"/></xsl:call-template></xsl:when> <!--/ncong N: not congruent with --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≈')"><xsl:value-of select="'\approx '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≈')"/></xsl:call-template></xsl:when> <!--/approx R: approximate --> ++ <xsl:when test="starts-with($content,'≈')"><xsl:value-of select="'\approx '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≈')"/></xsl:call-template></xsl:when> <!--/approx R: approximate --> + <!-- <xsl:when test="starts-with($content,'≉̸')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≉̸')"/></xsl:call-template></xsl:when> not, vert, approximate --> +- <xsl:when test="starts-with($content,'≉')"><xsl:value-of select="'\not\approx '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≉')"/></xsl:call-template></xsl:when> <!--/napprox N: not approximate --> ++ <xsl:when test="starts-with($content,'≉')"><xsl:value-of select="'\napprox '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≉')"/></xsl:call-template></xsl:when> <!--/napprox N: not approximate --> + <xsl:when test="starts-with($content,'≊')"><xsl:value-of select="'\approxeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≊')"/></xsl:call-template></xsl:when> <!--/approxeq R: approximate, equals --> <!-- Required amssymb --> +-<!-- <xsl:when test="starts-with($content,'≋')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≋')"/></xsl:call-template></xsl:when> approximately identical to --> +-<!-- <xsl:when test="starts-with($content,'≌')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≌')"/></xsl:call-template></xsl:when> /backcong R: reverse congruent --> ++ <xsl:when test="starts-with($content,'≋̸')"><xsl:value-of select="'\not\apid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≋̸')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'≋')"><xsl:value-of select="'\tildetrpl '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≋')"/></xsl:call-template></xsl:when> <!-- approximately identical to --> ++ <xsl:when test="starts-with($content,'≌')"><xsl:value-of select="'\allequal '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≌')"/></xsl:call-template></xsl:when> <!-- /backcong R: reverse congruent --> + <xsl:when test="starts-with($content,'≍')"><xsl:value-of select="'\asymp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≍')"/></xsl:call-template></xsl:when> <!--/asymp R: asymptotically equal to --> +- <xsl:when test="starts-with($content,'≎')"><xsl:value-of select="'\Bumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≎')"/></xsl:call-template></xsl:when> <!--/Bumpeq R: bumpy equals --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≏')"><xsl:value-of select="'\bumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≏')"/></xsl:call-template></xsl:when> <!--/bumpeq R: bumpy equals, equals --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≎̸')"><xsl:value-of select="'\nBumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≎̸')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'≎')"><xsl:value-of select="'\Bumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≎')"/></xsl:call-template></xsl:when> <!--/Bumpeq R: bumpy equals --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≏̸')"><xsl:value-of select="'\nbumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≏̸')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'≏')"><xsl:value-of select="'\bumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≏')"/></xsl:call-template></xsl:when> <!--/bumpeq R: bumpy equals, equals --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≐̸')"><xsl:value-of select="'\not\doteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≐̸')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'≐')"><xsl:value-of select="'\doteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≐')"/></xsl:call-template></xsl:when> <!--/doteq R: equals, single dot above --> +- <xsl:when test="starts-with($content,'≑')"><xsl:value-of select="'\doteqdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≑')"/></xsl:call-template></xsl:when> <!--/doteqdot /Doteq R: eq, even dots --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≒')"><xsl:value-of select="'\fallingdotseq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≒')"/></xsl:call-template></xsl:when> <!--/fallingdotseq R: eq, falling dots --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≑')"><xsl:value-of select="'\Doteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≑')"/></xsl:call-template></xsl:when> <!--/doteqdot /Doteq R: eq, even dots --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≒')"><xsl:value-of select="'\fallingdotseq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≒')"/></xsl:call-template></xsl:when><!--/fallingdotseq R: eq, falling dots --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'≓')"><xsl:value-of select="'\risingdotseq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≓')"/></xsl:call-template></xsl:when> <!--/risingdotseq R: eq, rising dots --> <!-- Required amssymb --> +-<!-- <xsl:when test="starts-with($content,'≔')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≔')"/></xsl:call-template></xsl:when> /coloneq R: colon, equals --> +-<!-- <xsl:when test="starts-with($content,'≕')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≕')"/></xsl:call-template></xsl:when> /eqcolon R: equals, colon --> +- <xsl:when test="starts-with($content,'≖')"><xsl:value-of select="'\eqcirc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≖')"/></xsl:call-template></xsl:when> <!--/eqcirc R: circle on equals sign --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≗')"><xsl:value-of select="'\circeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≗')"/></xsl:call-template></xsl:when> <!--/circeq R: circle, equals --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≔')"><xsl:value-of select="'\coloneq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≔')"/></xsl:call-template></xsl:when> <!--/coloneq R: colon, equals --> ++ <xsl:when test="starts-with($content,'≕')"><xsl:value-of select="'\eqcolon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≕')"/></xsl:call-template></xsl:when> <!--/eqcolon R: equals, colon --> ++ <xsl:when test="starts-with($content,'≖')"><xsl:value-of select="'\eqcirc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≖')"/></xsl:call-template></xsl:when> <!--/eqcirc R: circle on equals sign --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≗')"><xsl:value-of select="'\circeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≗')"/></xsl:call-template></xsl:when> <!--/circeq R: circle, equals --> <!-- Required amssymb --> + <!-- ? --> <xsl:when test="starts-with($content,'≘')"><xsl:value-of select="'\stackrel{\frown}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≘')"/></xsl:call-template></xsl:when> +-<!-- ? --> <xsl:when test="starts-with($content,'≙')"><xsl:value-of select="'\stackrel{\wedge}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≙')"/></xsl:call-template></xsl:when> <!--/wedgeq R: corresponds to (wedge, equals) --> +-<!-- ? --> <xsl:when test="starts-with($content,'≚')"><xsl:value-of select="'\stackrel{\vee}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≚')"/></xsl:call-template></xsl:when> <!--logical or, equals --> +-<!-- ? --> <xsl:when test="starts-with($content,'≛')"><xsl:value-of select="'\stackrel{\star}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≛')"/></xsl:call-template></xsl:when> <!--equal, asterisk above --> ++ <xsl:when test="starts-with($content,'≙')"><xsl:value-of select="'\wedgeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≙')"/></xsl:call-template></xsl:when> <!--/wedgeq R: corresponds to (wedge, equals) --> ++ <xsl:when test="starts-with($content,'≚')"><xsl:value-of select="'\ElsevierGlyph{225A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≚')"/></xsl:call-template></xsl:when> <!--logical or, equals --> ++ <xsl:when test="starts-with($content,'≛')"><xsl:value-of select="'\starequal '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≛')"/></xsl:call-template></xsl:when> <!--equal, asterisk above --> + <xsl:when test="starts-with($content,'≜')"><xsl:value-of select="'\triangleq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≜')"/></xsl:call-template></xsl:when> <!--/triangleq R: triangle, equals --> <!-- Required amssymb --> + <!-- ? --> <xsl:when test="starts-with($content,'≝')"><xsl:value-of select="'\stackrel{\scriptscriptstyle\mathrm{def}}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≝')"/></xsl:call-template></xsl:when> + <!-- ? --> <xsl:when test="starts-with($content,'≞')"><xsl:value-of select="'\stackrel{\scriptscriptstyle\mathrm{m}}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≞')"/></xsl:call-template></xsl:when> +-<!-- ? --> <xsl:when test="starts-with($content,'≟')"><xsl:value-of select="'\stackrel{?}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≟')"/></xsl:call-template></xsl:when> <!--/questeq R: equal with questionmark --> ++ <xsl:when test="starts-with($content,'≟')"><xsl:value-of select="'\questeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≟')"/></xsl:call-template></xsl:when> <!--/questeq R: equal with questionmark --> + <!-- <xsl:when test="starts-with($content,'≠︀')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≠︀')"/></xsl:call-template></xsl:when> not equal, dot --> + <xsl:when test="starts-with($content,'≠')"><xsl:value-of select="'\ne '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≠')"/></xsl:call-template></xsl:when> <!--/ne /neq R: not equal --> + <!-- <xsl:when test="starts-with($content,'≡⃥')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≡⃥')"/></xsl:call-template></xsl:when> reverse not equivalent --> + <xsl:when test="starts-with($content,'≡')"><xsl:value-of select="'\equiv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≡')"/></xsl:call-template></xsl:when> <!--/equiv R: identical with --> +- <xsl:when test="starts-with($content,'≢')"><xsl:value-of select="'\not\equiv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≢')"/></xsl:call-template></xsl:when> <!--/nequiv N: not identical with --> ++ <xsl:when test="starts-with($content,'≢')"><xsl:value-of select="'\nequiv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≢')"/></xsl:call-template></xsl:when> <!--/nequiv N: not identical with --> + <!-- <xsl:when test="starts-with($content,'≣')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≣')"/></xsl:call-template></xsl:when> --> + <xsl:when test="starts-with($content,'≤')"><xsl:value-of select="'\le '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≤')"/></xsl:call-template></xsl:when> <!--/leq /le R: less-than-or-equal --> + <xsl:when test="starts-with($content,'≥')"><xsl:value-of select="'\ge '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≥')"/></xsl:call-template></xsl:when> <!--/geq /ge R: greater-than-or-equal --> + <xsl:when test="starts-with($content,'≦')"><xsl:value-of select="'\leqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≦')"/></xsl:call-template></xsl:when> <!--/leqq R: less, double equals --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'≧')"><xsl:value-of select="'\geqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≧')"/></xsl:call-template></xsl:when> <!--/geqq R: greater, double equals --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≨︀')"><xsl:value-of select="'\lvertneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≨︀')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'≨')"><xsl:value-of select="'\lneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≨')"/></xsl:call-template></xsl:when> <!--/lneqq N: less, not double equals --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≩︀')"><xsl:value-of select="'\gvertneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≩︀')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'≩')"><xsl:value-of select="'\gneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≩')"/></xsl:call-template></xsl:when> <!--/gneqq N: greater, not dbl equals --> <!-- Required amssymb --> + <!-- <xsl:when test="starts-with($content,'≪̸︀')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≪̸︀')"/></xsl:call-template></xsl:when> not much less than, variant --> +-<!-- <xsl:when test="starts-with($content,'≪̸')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≪̸')"/></xsl:call-template></xsl:when> not, vert, much less than --> ++ <xsl:when test="starts-with($content,'≪̸')"><xsl:value-of select="'\NotLessLess '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≪̸')"/></xsl:call-template></xsl:when> <!-- not, vert, much less than --> + <xsl:when test="starts-with($content,'≪')"><xsl:value-of select="'\ll '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≪')"/></xsl:call-template></xsl:when> <!--/ll R: double less-than sign --> + <!-- <xsl:when test="starts-with($content,'≫̸︀')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≫̸︀')"/></xsl:call-template></xsl:when> not much greater than, variant --> +-<!-- <xsl:when test="starts-with($content,'≫̸')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≫̸')"/></xsl:call-template></xsl:when> not, vert, much greater than --> ++ <xsl:when test="starts-with($content,'≫̸')"><xsl:value-of select="'\NotGreaterGreater '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≫̸')"/></xsl:call-template></xsl:when> <!-- not, vert, much greater than --> + <xsl:when test="starts-with($content,'≫')"><xsl:value-of select="'\gg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≫')"/></xsl:call-template></xsl:when> <!--/gg R: dbl greater-than sign --> + <xsl:when test="starts-with($content,'≬')"><xsl:value-of select="'\between '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≬')"/></xsl:call-template></xsl:when> <!--/between R: between --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≭')"><xsl:value-of select="'\not\asymp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≭')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'≭')"><xsl:value-of select="'\not\kern-0.3em\times '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≭')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'≮')"><xsl:value-of select="'\nless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≮')"/></xsl:call-template></xsl:when> <!--/nless N: not less-than --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'≯')"><xsl:value-of select="'\ngtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≯')"/></xsl:call-template></xsl:when> <!--/ngtr N: not greater-than --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≰⃥')"><xsl:value-of select="'\nleq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≰⃥')"/></xsl:call-template></xsl:when> <!--/nleq N: not less-than-or-equal --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≰')"><xsl:value-of select="'\nleqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≰')"/></xsl:call-template></xsl:when> <!--/nleqq N: not less, dbl equals --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≱⃥')"><xsl:value-of select="'\ngeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≱⃥')"/></xsl:call-template></xsl:when> <!--/ngeq N: not greater-than-or-equal --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≱')"><xsl:value-of select="'\ngeqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≱')"/></xsl:call-template></xsl:when> <!--/ngeqq N: not greater, dbl equals --> <!-- Required amssymb --> ++<!-- <xsl:when test="starts-with($content,'≰⃥')"><xsl:value-of select="'\nleq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≰⃥')"/></xsl:call-template></xsl:when> /nleq N: not less-than-or-equal --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≰')"><xsl:value-of select="'\nleq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≰')"/></xsl:call-template></xsl:when> <!--/nleqq N: not less, dbl equals --> <!-- Required amssymb --> ++<!-- <xsl:when test="starts-with($content,'≱⃥')"><xsl:value-of select="'\ngeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≱⃥')"/></xsl:call-template></xsl:when> /ngeq N: not greater-than-or-equal --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≱')"><xsl:value-of select="'\ngeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≱')"/></xsl:call-template></xsl:when> <!--/ngeqq N: not greater, dbl equals --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'≲')"><xsl:value-of select="'\lesssim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≲')"/></xsl:call-template></xsl:when> <!--/lesssim R: less, similar --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'≳')"><xsl:value-of select="'\gtrsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≳')"/></xsl:call-template></xsl:when> <!--/gtrsim R: greater, similar --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≴')"><xsl:value-of select="'\not\lesssim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≴')"/></xsl:call-template></xsl:when> <!--not less, similar --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≵')"><xsl:value-of select="'\not\gtrsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≵')"/></xsl:call-template></xsl:when> <!--not greater, similar --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≴')"><xsl:value-of select="'\ElsevierGlyph{2274} '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≴')"/></xsl:call-template></xsl:when> <!--not less, similar --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≵')"><xsl:value-of select="'\ElsevierGlyph{2275} '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≵')"/></xsl:call-template></xsl:when> <!--not greater, similar --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'≶')"><xsl:value-of select="'\lessgtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≶')"/></xsl:call-template></xsl:when> <!--/lessgtr R: less, greater --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'≷')"><xsl:value-of select="'\gtrless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≷')"/></xsl:call-template></xsl:when> <!--/gtrless R: greater, less --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≸')"><xsl:value-of select="'\not\lessgtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≸')"/></xsl:call-template></xsl:when> <!--not less, greater --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'≹')"><xsl:value-of select="'\not\gtrless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≹')"/></xsl:call-template></xsl:when> <!--not greater, less --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≸')"><xsl:value-of select="'\notlessgreater '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≸')"/></xsl:call-template></xsl:when> <!--not less, greater --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≹')"><xsl:value-of select="'\notgreaterless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≹')"/></xsl:call-template></xsl:when> <!--not greater, less --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'≺')"><xsl:value-of select="'\prec '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≺')"/></xsl:call-template></xsl:when> <!--/prec R: precedes --> + <xsl:when test="starts-with($content,'≻')"><xsl:value-of select="'\succ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≻')"/></xsl:call-template></xsl:when> <!--/succ R: succeeds --> + <xsl:when test="starts-with($content,'≼')"><xsl:value-of select="'\preccurlyeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≼')"/></xsl:call-template></xsl:when> <!--/preccurlyeq R: precedes, curly eq --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'≽')"><xsl:value-of select="'\succcurlyeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≽')"/></xsl:call-template></xsl:when> <!--/succcurlyeq R: succeeds, curly eq --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≾̸')"><xsl:value-of select="'\nprecsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≾̸')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'≾')"><xsl:value-of select="'\precsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≾')"/></xsl:call-template></xsl:when> <!--/precsim R: precedes, similar --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'≿̸')"><xsl:value-of select="'\nsuccsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≿̸')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'≿')"><xsl:value-of select="'\succsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '≿')"/></xsl:call-template></xsl:when> <!--/succsim R: succeeds, similar --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'⊀')"><xsl:value-of select="'\nprec '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊀')"/></xsl:call-template></xsl:when> <!--/nprec N: not precedes --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'⊁')"><xsl:value-of select="'\nsucc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊁')"/></xsl:call-template></xsl:when> <!--/nsucc N: not succeeds --> <!-- Required amssymb --> +@@ -360,21 +769,59 @@ + <xsl:when test="starts-with($content,'⊅')"><xsl:value-of select="'\not\supset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊅')"/></xsl:call-template></xsl:when> <!--not superset --> + <xsl:when test="starts-with($content,'⊆')"><xsl:value-of select="'\subseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊆')"/></xsl:call-template></xsl:when> <!--/subseteq R: subset, equals --> + <xsl:when test="starts-with($content,'⊇')"><xsl:value-of select="'\supseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊇')"/></xsl:call-template></xsl:when> <!--/supseteq R: superset, equals --> ++ <xsl:when test="starts-with($content,'⊈')"><xsl:value-of select="'\nsubseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊈')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊉')"><xsl:value-of select="'\nsupseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊉')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊊︀')"><xsl:value-of select="'\varsubsetneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊊︀')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊊')"><xsl:value-of select="'\subsetneq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊊')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊋︀')"><xsl:value-of select="'\varsupsetneq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊋︀')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊋')"><xsl:value-of select="'\supsetneq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊋')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊍')"><xsl:value-of select="'\cupdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊍')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'⊎')"><xsl:value-of select="'\uplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊎')"/></xsl:call-template></xsl:when> <!--/uplus B: plus sign in union --> ++ <xsl:when test="starts-with($content,'⊏̸')"><xsl:value-of select="'\NotSquareSubset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊏̸')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊏')"><xsl:value-of select="'\sqsubset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊏')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊐̸')"><xsl:value-of select="'\NotSquareSuperset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊐̸')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊐')"><xsl:value-of select="'\sqsupset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊐')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊑')"><xsl:value-of select="'\sqsubseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊑')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊒')"><xsl:value-of select="'\sqsupseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊒')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'⊓')"><xsl:value-of select="'\sqcap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊓')"/></xsl:call-template></xsl:when> <!--/sqcap B: square intersection --> +- <xsl:when test="starts-with($content,'⊔')"><xsl:value-of select="'\bigsqcup '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊔')"/></xsl:call-template></xsl:when> <!--/sqcup B: square union --> ++ <xsl:when test="starts-with($content,'⊔')"><xsl:value-of select="'\sqcup '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊔')"/></xsl:call-template></xsl:when> <!--/sqcup B: square union --> + <xsl:when test="starts-with($content,'⊕')"><xsl:value-of select="'\oplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊕')"/></xsl:call-template></xsl:when> <!--/oplus B: plus sign in circle --> + <xsl:when test="starts-with($content,'⊖')"><xsl:value-of select="'\ominus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊖')"/></xsl:call-template></xsl:when> <!--/ominus B: minus sign in circle --> + <xsl:when test="starts-with($content,'⊗')"><xsl:value-of select="'\otimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊗')"/></xsl:call-template></xsl:when> <!--/otimes B: multiply sign in circle --> + <xsl:when test="starts-with($content,'⊘')"><xsl:value-of select="'\oslash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊘')"/></xsl:call-template></xsl:when> <!--/oslash B: solidus in circle --> +-<!-- ? --> <xsl:when test="starts-with($content,'⊙')"><xsl:value-of select="'\odot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊙')"/></xsl:call-template></xsl:when> <!--/odot B: middle dot in circle --> <!--/bigodot L: circle dot operator --> ++ <xsl:when test="starts-with($content,'⊙')"><xsl:value-of select="'\odot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊙')"/></xsl:call-template></xsl:when> <!--/odot B: middle dot in circle --> <!--/bigodot L: circle dot operator --> ++ <xsl:when test="starts-with($content,'⊚')"><xsl:value-of select="'\circledcirc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊚')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊛')"><xsl:value-of select="'\circledast '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊛')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊝')"><xsl:value-of select="'\circleddash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊝')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊞')"><xsl:value-of select="'\boxplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊞')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'⊟')"><xsl:value-of select="'\boxminus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊟')"/></xsl:call-template></xsl:when> <!--/boxminus B: minus sign in box --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'⊠')"><xsl:value-of select="'\boxtimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊠')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊡')"><xsl:value-of select="'\boxdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊡')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊢')"><xsl:value-of select="'\vdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊢')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊣')"><xsl:value-of select="'\dashv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊣')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'⊤')"><xsl:value-of select="'\top '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊤')"/></xsl:call-template></xsl:when> <!--/top top --> + <xsl:when test="starts-with($content,'⊥')"><xsl:value-of select="'\perp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊥')"/></xsl:call-template></xsl:when> <!--/perp R: perpendicular --><!--/bot bottom --> +- <xsl:when test="starts-with($content,'⊦')"><xsl:value-of select="'\vdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊦')"/></xsl:call-template></xsl:when> <!--/vdash R: vertical, dash --> +- <xsl:when test="starts-with($content,'⊧')"><xsl:value-of select="'\vDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊧')"/></xsl:call-template></xsl:when> <!--/vDash R: vertical, dbl dash --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'⊨')"><xsl:value-of select="'\models '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊨')"/></xsl:call-template></xsl:when> <!--/models R: --> ++<!-- <xsl:when test="starts-with($content,'⊦')"><xsl:value-of select="'\vdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊦')"/></xsl:call-template></xsl:when> /vdash R: vertical, dash --> ++ <xsl:when test="starts-with($content,'⊧')"><xsl:value-of select="'\models '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊧')"/></xsl:call-template></xsl:when> <!--/vDash R: vertical, dbl dash --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'⊨')"><xsl:value-of select="'\vDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊨')"/></xsl:call-template></xsl:when> <!--/models R: --> ++ <xsl:when test="starts-with($content,'⊩')"><xsl:value-of select="'\Vdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊩')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'⊪')"><xsl:value-of select="'\Vvdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊪')"/></xsl:call-template></xsl:when> <!--/Vvdash R: triple vertical, dash --> <!-- Required amssymb --> ++ <xsl:when test="starts-with($content,'⊫')"><xsl:value-of select="'\VDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊫')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊬')"><xsl:value-of select="'\nvdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊬')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊭')"><xsl:value-of select="'\nvDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊭')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊮')"><xsl:value-of select="'\nVdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊮')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊯')"><xsl:value-of select="'\nVDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊯')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊲')"><xsl:value-of select="'\vartriangleleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊲')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊳')"><xsl:value-of select="'\vartriangleright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊳')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊴')"><xsl:value-of select="'\trianglelefteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊴')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊵')"><xsl:value-of select="'\trianglerighteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊵')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊶')"><xsl:value-of select="'\original '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊶')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊷')"><xsl:value-of select="'\image '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊷')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊸')"><xsl:value-of select="'\multimap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊸')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊹')"><xsl:value-of select="'\hermitconjmatrix '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊹')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊺')"><xsl:value-of select="'\intercal '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊺')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊻')"><xsl:value-of select="'\veebar '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊻')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⊾')"><xsl:value-of select="'\rightanglearc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⊾')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'⋀')"><xsl:value-of select="'\bigwedge '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋀')"/></xsl:call-template></xsl:when> <!--/bigwedge L: logical or operator --> + <xsl:when test="starts-with($content,'⋁')"><xsl:value-of select="'\bigvee '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋁')"/></xsl:call-template></xsl:when> <!--/bigcap L: intersection operator --> + <xsl:when test="starts-with($content,'⋂')"><xsl:value-of select="'\bigcap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋂')"/></xsl:call-template></xsl:when> <!--/bigvee L: logical and operator --> +@@ -384,11 +831,41 @@ + <xsl:when test="starts-with($content,'⋆')"><xsl:value-of select="'\star '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋆')"/></xsl:call-template></xsl:when> <!--/star B: small star, filled --> + <xsl:when test="starts-with($content,'⋇')"><xsl:value-of select="'\divideontimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋇')"/></xsl:call-template></xsl:when> <!--/divideontimes B: division on times --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'⋈')"><xsl:value-of select="'\bowtie '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋈')"/></xsl:call-template></xsl:when> <!--/bowtie R: --> ++ <xsl:when test="starts-with($content,'⋉')"><xsl:value-of select="'\ltimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋉')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋊')"><xsl:value-of select="'\rtimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋊')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋋')"><xsl:value-of select="'\leftthreetimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋋')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋌')"><xsl:value-of select="'\rightthreetimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋌')"/></xsl:call-template></xsl:when> + <xsl:when test="starts-with($content,'⋍')"><xsl:value-of select="'\backsimeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋍')"/></xsl:call-template></xsl:when> <!--/backsimeq R: reverse similar, eq --> <!-- Required amssymb --> +- <xsl:when test="starts-with($content,'⋯')"><xsl:value-of select="'\cdots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋯')"/></xsl:call-template></xsl:when> <!--/cdots, three dots, centered --> +-<!-- <xsl:when test="starts-with($content,'⋰')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋰')"/></xsl:call-template></xsl:when> three dots, ascending --> +- <xsl:when test="starts-with($content,'⋱')"><xsl:value-of select="'\ddots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋱')"/></xsl:call-template></xsl:when> <!--/ddots, three dots, descending --> +- ++ <xsl:when test="starts-with($content,'⋎')"><xsl:value-of select="'\curlyvee '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋎')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋏')"><xsl:value-of select="'\curlywedge '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋏')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋐')"><xsl:value-of select="'\Subset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋐')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋑')"><xsl:value-of select="'\Supset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋑')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋒')"><xsl:value-of select="'\Cap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋒')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋓')"><xsl:value-of select="'\Cup '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋓')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋔')"><xsl:value-of select="'\pitchfork '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋔')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋖')"><xsl:value-of select="'\lessdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋖')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋗')"><xsl:value-of select="'\gtrdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋗')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋘')"><xsl:value-of select="'\verymuchless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋘')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋙')"><xsl:value-of select="'\ggg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋙')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋚')"><xsl:value-of select="'\lesseqgtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋚')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋛')"><xsl:value-of select="'\gtreqless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋛')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋞')"><xsl:value-of select="'\curlyeqprec '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋞')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋟')"><xsl:value-of select="'\curlyeqsucc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋟')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋢')"><xsl:value-of select="'\not\sqsubseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋢')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋣')"><xsl:value-of select="'\not\sqsupseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋣')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋥')"><xsl:value-of select="'\Elzsqspne '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋥')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋦')"><xsl:value-of select="'\lnsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋦')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋧')"><xsl:value-of select="'\gnsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋧')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋨')"><xsl:value-of select="'\precnsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋨')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋩')"><xsl:value-of select="'\succnsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋩')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋪')"><xsl:value-of select="'\ntriangleleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋪')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋫')"><xsl:value-of select="'\ntriangleright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋫')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋬')"><xsl:value-of select="'\ntrianglelefteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋬')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋭')"><xsl:value-of select="'\ntrianglerighteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋭')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋮')"><xsl:value-of select="'\vdots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋮')"/></xsl:call-template></xsl:when> ++ <xsl:when test="starts-with($content,'⋯')"><xsl:value-of select="'\cdots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋯')"/></xsl:call-template></xsl:when> <!--/cdots, three dots, centered --> ++ <xsl:when test="starts-with($content,'⋰')"><xsl:value-of select="'\backslash adots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋰')"/></xsl:call-template></xsl:when> <!-- three dots, ascending --> ++ <xsl:when test="starts-with($content,'⋱')"><xsl:value-of select="'\ddots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '⋱')"/></xsl:call-template></xsl:when> <!--/ddots, three dots, descending --> + <!-- ====================================================================== --> + <!-- Unicode 3.2 + Miscellaneous Technical +@@ -404,20 +881,22 @@ + <!-- ====================================================================== --> + <xsl:when test="starts-with($content,'□')"><xsl:value-of select="'\square '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '□')"/></xsl:call-template></xsl:when> <!--/square, square --> <!-- Required amssymb --> + <xsl:when test="starts-with($content,'▪')"><xsl:value-of select="'\blacksquare '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '▪')"/></xsl:call-template></xsl:when> <!--/blacksquare, square, filled --> <!-- Required amssymb --> ++ ++ <xsl:when test='starts-with($content,"ƛ")'><xsl:value-of select='"\lambda\!\!\!{}^{-}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, 'ƛ')"/></xsl:call-template></xsl:when> ++ ++<!-- Double brackets (only supported as workaround in MediaWiki). --> ++ <xsl:when test='starts-with($content,"〚")'><xsl:value-of select='"[\!["' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '〚')"/></xsl:call-template></xsl:when> ++ <xsl:when test='starts-with($content,"〛")'><xsl:value-of select='"]\!]"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '〛')"/></xsl:call-template></xsl:when> ++ ++<!-- Entities undefined in Unicode, but used by OOo for parenteses. --> ++ <xsl:when test='starts-with($content,"")'><xsl:value-of select='"("' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '')"/></xsl:call-template></xsl:when> ++ <xsl:when test='starts-with($content,"")'><xsl:value-of select='")"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '')"/></xsl:call-template></xsl:when> + + <xsl:when test='starts-with($content,"'")'><xsl:value-of select='"\text{'}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select='substring-after($content, "'")'/></xsl:call-template></xsl:when><!-- \text required amslatex --> + + <xsl:when test='starts-with($content,"{")'><xsl:value-of select='"\{"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '{')"/></xsl:call-template></xsl:when> + <xsl:when test='starts-with($content,"}")'><xsl:value-of select='"\}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '}')"/></xsl:call-template></xsl:when> +- +-<!--- special characters --> +- <xsl:when test='starts-with($content,"$")'><xsl:value-of select='"\$"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '$')"/></xsl:call-template></xsl:when> +- <xsl:when test='starts-with($content,"#")'><xsl:value-of select='"\#"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '#')"/></xsl:call-template></xsl:when> +- <xsl:when test='starts-with($content,"&")'><xsl:value-of select='"\&"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&')"/></xsl:call-template></xsl:when> +- <xsl:when test='starts-with($content,"%")'><xsl:value-of select='"\%"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '%')"/></xsl:call-template></xsl:when> +- <xsl:when test='starts-with($content,"_")'><xsl:value-of select='"\_"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '_')"/></xsl:call-template></xsl:when> +- <xsl:when test='starts-with($content,"\")'><xsl:value-of select='"\backslash "' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '\')"/></xsl:call-template></xsl:when> +- ++ + <xsl:otherwise> + <xsl:value-of select="substring($content,1,1)"/> + <xsl:call-template name="replaceEntities"> +@@ -445,7 +924,12 @@ + <xsl:when test='starts-with($content,"&")'><xsl:value-of select='"\&"' /><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '&')"/></xsl:call-template></xsl:when> + <xsl:when test='starts-with($content,"%")'><xsl:value-of select='"\%"' /><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '%')"/></xsl:call-template></xsl:when> + <xsl:when test='starts-with($content,"_")'><xsl:value-of select='"\_"' /><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '_')"/></xsl:call-template></xsl:when> +- <xsl:when test='starts-with($content,"\")'><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '\')"/></xsl:call-template></xsl:when> ++ <xsl:when test='starts-with($content,"\")'><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '\')"/></xsl:call-template></xsl:when> ++ ++ <!-- Ignore "lower than" and "greater than" symbols, which break the MediaWiki parser in text mode. --> ++ <xsl:when test='starts-with($content,">")'><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '>')"/></xsl:call-template></xsl:when> ++ <xsl:when test='starts-with($content,"<")'><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '<')"/></xsl:call-template></xsl:when> ++ + <xsl:otherwise> + <xsl:value-of select="substring($content,1,1)"/> + <xsl:call-template name="replaceMtextEntities"> +--- misc/xsltml_2.1.2/glayout.xsl 2009-03-27 08:11:02.000000000 +0100 ++++ misc/build/xsltml_2.1.2/glayout.xsl 2008-03-07 21:36:34.000000000 +0100 +@@ -1,12 +1,13 @@ + <?xml version='1.0' encoding="UTF-8"?> + <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +- xmlns:m="http://www.w3.org/1998/Math/MathML" ++ xmlns:m="http://www.w3.org/1998/Math/MathML" ++ xmlns:oomath="http://www.w3.org/1998/Math/MathML" + version='1.0'> + + <!-- ====================================================================== --> +-<!-- $Id: glayout.xsl,v 1.5 2003/06/10 12:24:04 shade33 Exp $ ++<!-- $Id: glayout.xsl 2755 2008-03-07 20:35:56Z hauma $ + This file is part of the XSLT MathML Library distribution. +- See ./README or http://www.raleigh.ru/MathML/mmltex for ++ See ./README or http://xsltml.sf.net for + copyright and other information --> + <!-- ====================================================================== --> + +@@ -92,17 +93,16 @@ + + <xsl:template match="m:mfenced"> + <xsl:choose> +- <xsl:when test="@open"> +- <xsl:if test="translate(@open,'{}[]()|','{{{{{{{')='{'"> ++ <xsl:when test="@oomath:open"> ++ <xsl:if test="translate(@oomath:open,'{}[]()|∣','{{{{{{{{{{')='{'"> + <xsl:text>\left</xsl:text> + </xsl:if> +- <xsl:if test="@open='{' or @open='}'"> +- <xsl:text>\</xsl:text> +- </xsl:if> +- <xsl:if test="translate(@open,'{}[]()|','{{{{{{{')!='{' and (translate(@close,'{}[]()|','{{{{{{{')='{' or not(@close))"> ++ <xsl:if test="translate(@oomath:open,'{}[]()|∣','{{{{{{{{{{')!='{' and (translate(@oomath:close,'{}[]()|∣','{{{{{{{{{{')='{' or not(@oomath:close))"> + <xsl:text>\left.</xsl:text> +- </xsl:if> +- <xsl:value-of select="@open"/> ++ </xsl:if> ++ <xsl:call-template name="replaceEntities"> ++ <xsl:with-param name="content" select="@oomath:open"/> ++ </xsl:call-template> + </xsl:when> + <xsl:otherwise><xsl:text>\left(</xsl:text></xsl:otherwise> + </xsl:choose> +@@ -128,26 +128,30 @@ + </xsl:if> + </xsl:for-each> + <xsl:choose> +- <xsl:when test="@close"> +- <xsl:if test="translate(@close,'{}[]()|','{{{{{{{')='{'"> ++ <xsl:when test="@oomath:close"> ++ <xsl:if test="translate(@oomath:close,'{}[]()|∣','{{{{{{{{{{')='{'"> + <xsl:text>\right</xsl:text> + </xsl:if> +- <xsl:if test="@close='{' or @close='}'"> +- <xsl:text>\</xsl:text> +- </xsl:if> +- <xsl:if test="translate(@close,'{}[]()|','{{{{{{{')!='{' and (translate(@open,'{}[]()|','{{{{{{{')='{' or not(@open))"> ++ <xsl:if test="translate(@oomath:close,'{}[]()|∣','{{{{{{{{{{')!='{' and (translate(@oomath:open,'{}[]()|∣','{{{{{{{{{{')='{' or not(@oomath:open))"> + <xsl:text>\right.</xsl:text> + </xsl:if> +- <xsl:value-of select="@close"/> ++ <xsl:call-template name="replaceEntities"> ++ <xsl:with-param name="content" select="@oomath:close"/> ++ </xsl:call-template> + </xsl:when> + <xsl:otherwise><xsl:text>\right)</xsl:text></xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template match="m:mphantom"> +- <xsl:text>\phantom{</xsl:text> +- <xsl:apply-templates/> ++<!-- Not supported by MediaWiki. --> ++<!-- ++ <xsl:text>\phantom{</xsl:text> ++ --> ++ <xsl:apply-templates/> ++<!-- + <xsl:text>}</xsl:text> ++ --> + </xsl:template> + + <xsl:template match="m:menclose"> +@@ -193,15 +197,21 @@ + </xsl:call-template> + <xsl:text>}{$</xsl:text> + </xsl:if> +- <xsl:if test="@color[not(@mathcolor)] or @mathcolor"> ++ <xsl:if test="@color or @mathcolor"> ++ <xsl:variable name="color"> ++ <xsl:choose> ++ <xsl:when test="@mathcolor"><xsl:value-of select="@mathcolor"/></xsl:when> ++ <xsl:when test="@color"><xsl:value-of select="@color"/></xsl:when> ++ </xsl:choose> ++ </xsl:variable> + <xsl:text>\textcolor[rgb]{</xsl:text> + <xsl:call-template name="color"> +- <xsl:with-param name="color" select="@color|@mathcolor"/> ++ <xsl:with-param name="color" select="$color"/> + </xsl:call-template> + <xsl:text>}{</xsl:text> + </xsl:if> + <xsl:apply-templates/> +- <xsl:if test="@color[not(@mathcolor)] or @mathcolor"> ++ <xsl:if test="@color or @mathcolor"> + <xsl:text>}</xsl:text> + </xsl:if> + <xsl:if test="@background"> +--- misc/xsltml_2.1.2/mmltex.xsl 2009-03-27 08:11:02.000000000 +0100 ++++ misc/build/xsltml_2.1.2/mmltex.xsl 2008-03-07 21:36:34.000000000 +0100 +@@ -6,9 +6,9 @@ + <xsl:output method="text" indent="no" encoding="UTF-8"/> + + <!-- ====================================================================== --> +-<!-- $Id: mmltex.xsl,v 1.7 2003/06/10 12:24:04 shade33 Exp $ ++<!-- $Id: mmltex.xsl 2755 2008-03-07 20:35:56Z hauma $ + This file is part of the XSLT MathML Library distribution. +- See ./README or http://www.raleigh.ru/MathML/mmltex for ++ See ./README or http://xsltml.sf.net for + copyright and other information --> + <!-- ====================================================================== --> + +--- misc/xsltml_2.1.2/scripts.xsl 2009-03-27 08:11:02.000000000 +0100 ++++ misc/build/xsltml_2.1.2/scripts.xsl 2008-03-07 21:36:34.000000000 +0100 +@@ -1,12 +1,13 @@ + <?xml version='1.0' encoding="UTF-8"?> + <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +- xmlns:m="http://www.w3.org/1998/Math/MathML" ++ xmlns:m="http://www.w3.org/1998/Math/MathML" ++ xmlns:oomath="http://www.w3.org/1998/Math/MathML" + version='1.0'> + + <!-- ====================================================================== --> +-<!-- $Id: scripts.xsl,v 1.4 2003/06/10 12:24:04 shade33 Exp $ ++<!-- $Id: scripts.xsl 2755 2008-03-07 20:35:56Z hauma $ + This file is part of the XSLT MathML Library distribution. +- See ./README or http://www.raleigh.ru/MathML/mmltex for ++ See ./README or http://xsltml.sf.net for + copyright and other information --> + <!-- ====================================================================== --> + +@@ -23,7 +24,7 @@ + </xsl:call-template> + <xsl:text>}</xsl:text> + </xsl:when> +- <xsl:when test="$over='︷'"> <!-- OverBrace - over brace --> ++ <xsl:when test="$over='︷' or $over=''"> <!-- OverBrace - over brace --> + <xsl:text>\overbrace{</xsl:text> + <xsl:call-template name="munder"> + <xsl:with-param name="base" select="$base"/> +@@ -64,7 +65,7 @@ + </xsl:call-template> + <xsl:text>}</xsl:text> + </xsl:when> +- <xsl:when test="$under='︸'"> <!-- UnderBrace - under brace --> ++ <xsl:when test="$under='︸' or $under=''"> <!-- UnderBrace - under brace --> + <xsl:text>\underbrace{</xsl:text> + <xsl:call-template name="mover"> + <xsl:with-param name="base" select="$base"/> +@@ -153,7 +154,7 @@ + <xsl:apply-templates select="./*[1]"/> + <xsl:text>}</xsl:text> + </xsl:when> +- <xsl:when test="$over='︷'"> <!-- OverBrace - over brace --> ++ <xsl:when test="$over='︷' or $over=''"> <!-- OverBrace - over brace --> + <xsl:text>\overbrace{</xsl:text> + <xsl:apply-templates select="./*[1]"/> + <xsl:text>}</xsl:text> +@@ -192,10 +193,51 @@ + <xsl:text>\ddot{</xsl:text> + <xsl:apply-templates select="./*[1]"/> + <xsl:text>}</xsl:text> +- </xsl:when> +- <xsl:when test="$over='̂' or $over='^'"> <!-- Hat or circ - circumflex accent --> ++ </xsl:when> ++ <xsl:when test="$over='´'"> <!-- Acute accent "´" --> ++ <xsl:text>\acute{</xsl:text> ++ <xsl:apply-templates select="./*[1]"/> ++ <xsl:text>}</xsl:text> ++ </xsl:when> ++ <xsl:when test="$over='`'"> <!-- Grave accent "`" --> ++ <xsl:text>\grave{</xsl:text> ++ <xsl:apply-templates select="./*[1]"/> ++ <xsl:text>}</xsl:text> ++ </xsl:when> ++ <xsl:when test="$over='ˇ'"> <!-- Caron (Mandarin Chinese third tone) "ˇ" --> ++ <xsl:text>\check{</xsl:text> ++ <xsl:apply-templates select="./*[1]"/> ++ <xsl:text>}</xsl:text> ++ </xsl:when> ++ <xsl:when test="$over='˘'"> <!-- Breve accent "˘" --> ++ <xsl:text>\breve{</xsl:text> ++ <xsl:apply-templates select="./*[1]"/> ++ <xsl:text>}</xsl:text> ++ </xsl:when> ++ <xsl:when test="$over='˚'"> <!-- ring above "˚" --> ++ <xsl:text>\overset{\circ}{</xsl:text> ++ <xsl:apply-templates select="./*[1]"/> ++ <xsl:text>}</xsl:text> ++ </xsl:when> ++ <xsl:when test="$over='ˉ'"> <!-- modifier letter Macron (Mandarin Chinese first tone) "ˉ" --> ++ <xsl:text>\bar{</xsl:text> ++ <xsl:apply-templates select="./*[1]"/> ++ <xsl:text>}</xsl:text> ++ </xsl:when> ++ <xsl:when test="$over='¨'"> <!-- Diaeresis "¨" --> ++ <xsl:text>\ddot{</xsl:text> ++ <xsl:apply-templates select="./*[1]"/> ++ <xsl:text>}</xsl:text> ++ </xsl:when> ++ <xsl:when test="$over='⃗'"> <!-- Vector --> ++ <xsl:text>\vec{</xsl:text> ++ <xsl:apply-templates select="./*[1]"/> ++ <xsl:text>}</xsl:text> ++ </xsl:when> ++ ++ <xsl:when test="$over='̂' or $over='^' or $over='ˆ'"> <!-- Hat or circ - circumflex accent --> + <xsl:choose> +- <xsl:when test="@accent='true'"> ++ <xsl:when test="@oomath:accent='true'"> + <xsl:text>\widehat{</xsl:text> + </xsl:when> + <xsl:otherwise> +@@ -244,7 +281,7 @@ + <xsl:apply-templates select="./*[1]"/> + <xsl:text>}</xsl:text> + </xsl:when> +- <xsl:when test="$under='︸'"> <!-- UnderBrace - under brace --> ++ <xsl:when test="$under='︸' or $under=''"> <!-- UnderBrace - under brace --> + <xsl:text>\underbrace{</xsl:text> + <xsl:apply-templates select="./*[1]"/> + <xsl:text>}</xsl:text> +--- misc/xsltml_2.1.2/tables.xsl 2009-03-27 08:11:02.000000000 +0100 ++++ misc/build/xsltml_2.1.2/tables.xsl 2008-03-07 21:36:34.000000000 +0100 +@@ -1,130 +1,218 @@ +-<?xml version='1.0' encoding="UTF-8"?> +-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +- xmlns:m="http://www.w3.org/1998/Math/MathML" +- version='1.0'> +- +-<!-- ====================================================================== --> +-<!-- $id: tables.xsl, 2002/17/05 Exp $ +- This file is part of the XSLT MathML Library distribution. +- See ./README or http://www.raleigh.ru/MathML/mmltex for +- copyright and other information --> +-<!-- ====================================================================== --> +- +-<xsl:template match="m:mtd[@columnspan]"> +- <xsl:text>\multicolumn{</xsl:text> +- <xsl:value-of select="@columnspan"/> +- <xsl:text>}{c}{</xsl:text> +- <xsl:apply-templates/> +- <xsl:text>}</xsl:text> +- <xsl:if test="count(following-sibling::*)>0"> +- <xsl:text>& </xsl:text> +- </xsl:if> +-</xsl:template> +- +- +-<xsl:template match="m:mtd"> +- <xsl:if test="@columnalign='right' or @columnalign='center'"> +- <xsl:text>\hfill </xsl:text> +- </xsl:if> +- <xsl:apply-templates/> +- <xsl:if test="@columnalign='left' or @columnalign='center'"> +- <xsl:text>\hfill </xsl:text> +- </xsl:if> +- <xsl:if test="count(following-sibling::*)>0"> +-<!-- this test valid for Sablotron, another form - test="not(position()=last())". +- Also for m:mtd[@columnspan] and m:mtr --> +- <xsl:text>& </xsl:text> +- </xsl:if> +-</xsl:template> +- +-<xsl:template match="m:mtr"> +- <xsl:apply-templates/> +- <xsl:if test="count(following-sibling::*)>0"> +- <xsl:text>\\ </xsl:text> +- </xsl:if> +-</xsl:template> +- +-<xsl:template match="m:mtable"> +- <xsl:text>\begin{array}{</xsl:text> +- <xsl:if test="@frame='solid'"> +- <xsl:text>|</xsl:text> +- </xsl:if> +- <xsl:variable name="numbercols" select="count(./m:mtr[1]/m:mtd[not(@columnspan)])+sum(./m:mtr[1]/m:mtd/@columnspan)"/> +- <xsl:choose> +- <xsl:when test="@columnalign"> +- <xsl:variable name="colalign"> +- <xsl:call-template name="colalign"> +- <xsl:with-param name="colalign" select="@columnalign"/> +- </xsl:call-template> +- </xsl:variable> +- <xsl:choose> +- <xsl:when test="string-length($colalign) > $numbercols"> +- <xsl:value-of select="substring($colalign,1,$numbercols)"/> +- </xsl:when> +- <xsl:when test="string-length($colalign) < $numbercols"> +- <xsl:value-of select="$colalign"/> +- <xsl:call-template name="generate-string"> +- <xsl:with-param name="text" select="substring($colalign,string-length($colalign))"/> +- <xsl:with-param name="count" select="$numbercols - string-length($colalign)"/> +- </xsl:call-template> +- </xsl:when> +- <xsl:otherwise> +- <xsl:value-of select="$colalign"/> +- </xsl:otherwise> +- </xsl:choose> +- </xsl:when> +- <xsl:otherwise> +- <xsl:call-template name="generate-string"> +- <xsl:with-param name="text" select="'c'"/> +- <xsl:with-param name="count" select="$numbercols"/> +- </xsl:call-template> +- </xsl:otherwise> +- </xsl:choose> +- <xsl:if test="@frame='solid'"> +- <xsl:text>|</xsl:text> +- </xsl:if> +- <xsl:text>}</xsl:text> +- <xsl:if test="@frame='solid'"> +- <xsl:text>\hline </xsl:text> +- </xsl:if> +- <xsl:apply-templates/> +- <xsl:if test="@frame='solid'"> +- <xsl:text>\\ \hline</xsl:text> +- </xsl:if> +- <xsl:text>\end{array}</xsl:text> +-</xsl:template> +- +-<xsl:template name="colalign"> +- <xsl:param name="colalign"/> +- <xsl:choose> +- <xsl:when test="contains($colalign,' ')"> +- <xsl:value-of select="substring($colalign,1,1)"/> +- <xsl:call-template name="colalign"> +- <xsl:with-param name="colalign" select="substring-after($colalign,' ')"/> +- </xsl:call-template> +- </xsl:when> +- <xsl:otherwise> +- <xsl:value-of select="substring($colalign,1,1)"/> +- </xsl:otherwise> +- </xsl:choose> +-</xsl:template> +- +-<xsl:template name="generate-string"> +-<!-- template from XSLT Standard Library v1.1 --> +- <xsl:param name="text"/> +- <xsl:param name="count"/> +- +- <xsl:choose> +- <xsl:when test="string-length($text) = 0 or $count <= 0"/> +- +- <xsl:otherwise> +- <xsl:value-of select="$text"/> +- <xsl:call-template name="generate-string"> +- <xsl:with-param name="text" select="$text"/> +- <xsl:with-param name="count" select="$count - 1"/> +- </xsl:call-template> +- </xsl:otherwise> +- </xsl:choose> +-</xsl:template> +- +-</xsl:stylesheet> +\ No newline at end of file ++<?xml version='1.0' encoding="UTF-8"?> ++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ++ xmlns:m="http://www.w3.org/1998/Math/MathML" ++ version='1.0'> ++ ++<!-- ====================================================================== --> ++<!-- $Id: tables.xsl 2755 2008-03-07 20:35:56Z hauma $ ++ This file is part of the XSLT MathML Library distribution. ++ See ./README or http://xsltml.sf.net for ++ copyright and other information --> ++<!-- ====================================================================== --> ++ ++<xsl:template match="m:mtd[@columnspan]"> ++ <xsl:text>\multicolumn{</xsl:text> ++ <xsl:value-of select="@columnspan"/> ++ <xsl:text>}{c}{</xsl:text> ++ <xsl:apply-templates/> ++ <xsl:text>}</xsl:text> ++ <xsl:if test="count(following-sibling::*)>0"> ++ <xsl:text>& </xsl:text> ++ </xsl:if> ++</xsl:template> ++ ++ ++<xsl:template match="m:mtd"> ++ <xsl:if test="@columnalign='right' or @columnalign='center'"> ++ <xsl:text>\hfill </xsl:text> ++ </xsl:if> ++ <xsl:apply-templates/> ++ <xsl:if test="@columnalign='left' or @columnalign='center'"> ++ <xsl:text>\hfill </xsl:text> ++ </xsl:if> ++</xsl:template> ++ ++<xsl:template match="m:mtr"> ++ <xsl:for-each select="*"> ++ <xsl:apply-templates select="current()"/> ++ <xsl:if test="not(position()=last())"> ++ <xsl:text>& </xsl:text> ++ </xsl:if> ++ </xsl:for-each> ++ <xsl:if test="not(position()=last())"> ++ <xsl:text>\\ </xsl:text> ++ <xsl:if test="../@rowlines"> ++ <xsl:variable name="line"> ++ <xsl:call-template name="getToken"> ++ <xsl:with-param name="text" select="../@rowlines"/> ++ <xsl:with-param name="position" select="position()"/> ++ </xsl:call-template> ++ </xsl:variable> ++ <xsl:if test="$line='solid'"> ++ <xsl:text>\hline </xsl:text> ++ </xsl:if> ++ </xsl:if> ++ </xsl:if> ++</xsl:template> ++ ++<xsl:template match="m:mtable"> ++ <xsl:text>\begin{array}{</xsl:text> ++ <xsl:if test="@frame='solid'"> ++ <xsl:text>|</xsl:text> ++ </xsl:if> ++ <xsl:variable name="numbercols" select="count(./m:mtr[1]/*[not(@columnspan)])+sum(./m:mtr[1]/m:mtd/@columnspan)"/> ++ <xsl:choose> ++ <xsl:when test="@columnalign and @columnlines"> ++ <xsl:call-template name="generateAlignString"> ++ <xsl:with-param name="columnalignstring" select="@columnalign"/> ++ <xsl:with-param name="columnlinestring" select="@columnlines"/> ++ <xsl:with-param name="count" select="$numbercols"/> ++ </xsl:call-template> ++ </xsl:when> ++ <xsl:when test="@columnlines"> ++ <xsl:call-template name="generateAlignString"> ++ <xsl:with-param name="columnlinestring" select="@columnlines"/> ++ <xsl:with-param name="count" select="$numbercols"/> ++ </xsl:call-template> ++ </xsl:when> ++ <xsl:when test="@columnalign"> ++ <xsl:call-template name="generateAlignString"> ++ <xsl:with-param name="columnalignstring" select="@columnalign"/> ++ <xsl:with-param name="count" select="$numbercols"/> ++ </xsl:call-template> ++ </xsl:when> ++ <xsl:otherwise> ++ <xsl:call-template name="generateAlignString"> ++ <xsl:with-param name="count" select="$numbercols"/> ++ </xsl:call-template> ++ </xsl:otherwise> ++ </xsl:choose> ++ <xsl:if test="@frame='solid'"> ++ <xsl:text>|</xsl:text> ++ </xsl:if> ++ <xsl:text>}</xsl:text> ++ <xsl:if test="@frame='solid'"> ++ <xsl:text>\hline </xsl:text> ++ </xsl:if> ++ <xsl:apply-templates/> ++ <xsl:if test="@frame='solid'"> ++ <xsl:text>\\ \hline </xsl:text> ++ </xsl:if> ++ <xsl:text>\end{array}</xsl:text> ++</xsl:template> ++ ++<xsl:template name="colalign"> ++ <xsl:param name="colalign"/> ++ <xsl:choose> ++ <xsl:when test="contains($colalign,' ')"> ++ <xsl:value-of select="substring($colalign,1,1)"/> ++ <xsl:call-template name="colalign"> ++ <xsl:with-param name="colalign" select="substring-after($colalign,' ')"/> ++ </xsl:call-template> ++ </xsl:when> ++ <xsl:otherwise> ++ <xsl:value-of select="substring($colalign,1,1)"/> ++ </xsl:otherwise> ++ </xsl:choose> ++</xsl:template> ++ ++<xsl:template name="generate-string"> ++<!-- template from XSLT Standard Library v1.1 --> ++ <xsl:param name="text"/> ++ <xsl:param name="count"/> ++ ++ <xsl:choose> ++ <xsl:when test="string-length($text) = 0 or $count <= 0"/> ++ ++ <xsl:otherwise> ++ <xsl:value-of select="$text"/> ++ <xsl:call-template name="generate-string"> ++ <xsl:with-param name="text" select="$text"/> ++ <xsl:with-param name="count" select="$count - 1"/> ++ </xsl:call-template> ++ </xsl:otherwise> ++ </xsl:choose> ++</xsl:template> ++ ++<xsl:template name="generateAlignString"> ++ <xsl:param name="columnalignstring">center</xsl:param> ++ <xsl:param name="columnlinestring"/> ++ <xsl:param name="count"/> ++ <xsl:choose> ++ <xsl:when test="$count <= 0"/> ++ <xsl:otherwise> ++ <xsl:variable name="columnalign"> ++ <xsl:call-template name="getToken"> ++ <xsl:with-param name="text" select="$columnalignstring"/> ++ <xsl:with-param name="position" select="1"/> ++ </xsl:call-template> ++ </xsl:variable> ++ <xsl:variable name="columnline"> ++ <xsl:call-template name="getToken"> ++ <xsl:with-param name="text" select="$columnlinestring"/> ++ <xsl:with-param name="position" select="1"/> ++ </xsl:call-template> ++ </xsl:variable> ++ <xsl:value-of select="substring($columnalign,1,1)"/> ++ <xsl:if test="$columnline='solid' and $count>1"><xsl:text>|</xsl:text></xsl:if> ++ <xsl:variable name="leftPartOrLastTokenA"> ++ <xsl:choose> ++ <xsl:when test="substring-after($columnalignstring,' ')"> ++ <xsl:value-of select="substring-after($columnalignstring,' ')"/> ++ </xsl:when> ++ <xsl:otherwise> ++ <xsl:value-of select="$columnalignstring"/> ++ </xsl:otherwise> ++ </xsl:choose> ++ </xsl:variable> ++ <xsl:variable name="leftPartOrLastTokenB"> ++ <xsl:choose> ++ <xsl:when test="substring-after($columnlinestring,' ')"> ++ <xsl:value-of select="substring-after($columnlinestring,' ')"/> ++ </xsl:when> ++ <xsl:otherwise> ++ <xsl:value-of select="$columnlinestring"/> ++ </xsl:otherwise> ++ </xsl:choose> ++ </xsl:variable> ++ <xsl:call-template name="generateAlignString"> ++ <xsl:with-param name="columnalignstring" select="$leftPartOrLastTokenA"/> ++ <xsl:with-param name="columnlinestring" select="$leftPartOrLastTokenB"/> ++ <xsl:with-param name="count" select="$count - 1"/> ++ </xsl:call-template> ++ </xsl:otherwise> ++ </xsl:choose> ++</xsl:template> ++ ++ ++<xsl:template name="getToken"> ++ <xsl:param name="text"/> ++ <xsl:param name="char" select="string(' ')"/> ++ <xsl:param name="position"/> ++ <xsl:choose> ++ <xsl:when test="$position = 1 or not(contains($text ,$char))"> ++ <xsl:choose> ++ <xsl:when test="contains($text ,$char)"> ++ <xsl:value-of select="substring-before($text,$char)"/> ++ </xsl:when> ++ <xsl:otherwise> ++ <xsl:value-of select="$text"/> ++ </xsl:otherwise> ++ </xsl:choose> ++ </xsl:when> ++ <xsl:when test="contains($text ,$char) and $position > 1"> ++ <xsl:variable name="last" select="substring-after($text,$char)"/> ++ <xsl:choose> ++ <xsl:when test="$position > 1"> ++ <xsl:call-template name="getToken"> ++ <xsl:with-param name="text" select="$last"/> ++ <xsl:with-param name="char" select="$char"/> ++ <xsl:with-param name="position" select="$position - 1"/> ++ </xsl:call-template> ++ </xsl:when> ++ </xsl:choose> ++ </xsl:when> ++ </xsl:choose> ++ </xsl:template> ++ ++</xsl:stylesheet> +\ No newline at end of file +--- misc/xsltml_2.1.2/tokens.xsl 2009-03-27 08:11:02.000000000 +0100 ++++ misc/build/xsltml_2.1.2/tokens.xsl 2008-03-07 21:36:34.000000000 +0100 +@@ -1,12 +1,13 @@ + <?xml version='1.0' encoding="UTF-8"?> + <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +- xmlns:m="http://www.w3.org/1998/Math/MathML" ++ xmlns:m="http://www.w3.org/1998/Math/MathML" ++ xmlns:oomath="http://www.w3.org/1998/Math/MathML" + version='1.0'> + + <!-- ====================================================================== --> +-<!-- $Id: tokens.xsl,v 1.7 2003/06/10 12:24:05 shade33 Exp $ ++<!-- $Id: tokens.xsl 2755 2008-03-07 20:35:56Z hauma $ + This file is part of the XSLT MathML Library distribution. +- See ./README or http://www.raleigh.ru/MathML/mmltex for ++ See ./README or http://xsltml.sf.net for + copyright and other information --> + <!-- ====================================================================== --> + +@@ -22,7 +23,15 @@ + </xsl:template> + + <xsl:template name="mi"> ++ <xsl:variable name="op"> ++ <xsl:value-of select="concat(' ',normalize-space(.),' ')"/> ++ </xsl:variable> + <xsl:choose> ++ <xsl:when test="contains(' arccos cos csc exp ker limsup min sinh arcsin cosh deg gcd lg ln Pr sup arctan cot det hom lim log sec tan arg coth dim inf liminf max sin tanh ',$op)"> ++ <xsl:text>\</xsl:text> ++ <xsl:value-of select="normalize-space(.)"/> ++ <xsl:text> </xsl:text> ++ </xsl:when> + <xsl:when test="string-length(normalize-space(.))>1 and not(@mathvariant)"> + <xsl:text>\mathrm{</xsl:text> + <xsl:apply-templates/> +@@ -51,10 +60,10 @@ + <xsl:template name="mo"> + <xsl:if test="translate(normalize-space(.),'()[]}|','{{{{{{')='{'"> + <xsl:choose> +- <xsl:when test="not(@stretchy='false') and count(preceding-sibling::m:mo[translate(normalize-space(.),'()[]}|','{{{{{{')='{'])mod 2=0 and following-sibling::m:mo[1][not(@stretchy='false')][translate(normalize-space(.),'()[]}|','{{{{{{')='{']"> ++ <xsl:when test="not(@oomath:stretchy='false') and count(preceding-sibling::m:mo[translate(normalize-space(.),'()[]}|','{{{{{{')='{'])mod 2=0 and following-sibling::m:mo[1][not(@oomath:stretchy='false')][translate(normalize-space(.),'()[]}|','{{{{{{')='{']"> + <xsl:text>\left</xsl:text> + </xsl:when> +- <xsl:when test="not(@stretchy='false') and count(preceding-sibling::m:mo[translate(normalize-space(.),'()[]}|','{{{{{{')='{'])mod 2=1 and preceding-sibling::m:mo[1][not(@stretchy='false')][translate(normalize-space(.),'()[]}|','{{{{{{')='{']"> ++ <xsl:when test="not(@oomath:stretchy='false') and count(preceding-sibling::m:mo[translate(normalize-space(.),'()[]}|','{{{{{{')='{'])mod 2=1 and preceding-sibling::m:mo[1][not(@oomath:stretchy='false')][translate(normalize-space(.),'()[]}|','{{{{{{')='{']"> + <xsl:text>\right</xsl:text> + </xsl:when> + </xsl:choose> +@@ -67,10 +76,13 @@ + <xsl:call-template name="replaceMtextEntities"> + <xsl:with-param name="content" select="normalize-space(.)"/> + </xsl:call-template> +- </xsl:variable> +- <xsl:text>\text{</xsl:text> +- <xsl:value-of select="$content"/> +- <xsl:text>}</xsl:text> ++ </xsl:variable> ++ <!-- Empty text content breaks the MediaWiki parser. --> ++ <xsl:if test="string-length($content) > 0"> ++ <xsl:text>\text{</xsl:text> ++ <xsl:value-of select="$content"/> ++ <xsl:text>}</xsl:text> ++ </xsl:if> + </xsl:template> + + <xsl:template match="m:mspace"> +@@ -111,10 +123,16 @@ + </xsl:call-template> + <xsl:text>}{$</xsl:text> + </xsl:if> +- <xsl:if test="@color[not(@mathcolor)] or @mathcolor"> <!-- Note: @color is deprecated in MathML 2.0 --> ++ <xsl:if test="@color or @mathcolor"> <!-- Note: @color is deprecated in MathML 2.0 --> ++ <xsl:variable name="color"> ++ <xsl:choose> ++ <xsl:when test="@mathcolor"><xsl:value-of select="@mathcolor"/></xsl:when> ++ <xsl:when test="@color"><xsl:value-of select="@color"/></xsl:when> ++ </xsl:choose> ++ </xsl:variable> + <xsl:text>\textcolor[rgb]{</xsl:text> + <xsl:call-template name="color"> +- <xsl:with-param name="color" select="@color|@mathcolor"/> ++ <xsl:with-param name="color" select="$color"/> + </xsl:call-template> + <xsl:text>}{</xsl:text> + </xsl:if> diff --git a/external/zlib/Makefile b/external/zlib/Makefile new file mode 100644 index 000000000..569ad8a0b --- /dev/null +++ b/external/zlib/Makefile @@ -0,0 +1,14 @@ +# -*- 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/. +# + +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/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk new file mode 100644 index 000000000..468cb2dea --- /dev/null +++ b/external/zlib/Module_zlib.mk @@ -0,0 +1,23 @@ +# -*- 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,zlib)) + +$(eval $(call gb_Module_add_targets,zlib,\ + StaticLibrary_zlib \ + UnpackedTarball_zlib \ +)) + +ifeq ($(BUILD_X64),TRUE) +$(eval $(call gb_Module_add_targets,zlib,\ + StaticLibrary_zlib_x64 \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/zlib/README b/external/zlib/README new file mode 100644 index 000000000..401875737 --- /dev/null +++ b/external/zlib/README @@ -0,0 +1 @@ +Compression library from [http://www.zlib.net/]. diff --git a/external/zlib/StaticLibrary_zlib.mk b/external/zlib/StaticLibrary_zlib.mk new file mode 100644 index 000000000..f5263bef7 --- /dev/null +++ b/external/zlib/StaticLibrary_zlib.mk @@ -0,0 +1,36 @@ +# -*- 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_StaticLibrary_StaticLibrary,zlib)) + +$(eval $(call gb_StaticLibrary_use_unpacked,zlib,zlib)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib)) + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\ + UnpackedTarball/zlib/adler32 \ + UnpackedTarball/zlib/compress \ + UnpackedTarball/zlib/crc32 \ + UnpackedTarball/zlib/deflate \ + UnpackedTarball/zlib/gzclose \ + UnpackedTarball/zlib/gzlib \ + UnpackedTarball/zlib/gzread \ + UnpackedTarball/zlib/gzwrite \ + UnpackedTarball/zlib/inffast \ + UnpackedTarball/zlib/inflate \ + UnpackedTarball/zlib/inftrees \ + UnpackedTarball/zlib/trees \ + UnpackedTarball/zlib/zutil \ +)) + +ifeq ($(ENABLE_DEBUG),TRUE) +$(eval $(call gb_StaticLibrary_add_cflags,zlib,-DZLIB_DEBUG)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/zlib/StaticLibrary_zlib_x64.mk b/external/zlib/StaticLibrary_zlib_x64.mk new file mode 100644 index 000000000..a51f326d1 --- /dev/null +++ b/external/zlib/StaticLibrary_zlib_x64.mk @@ -0,0 +1,39 @@ +# -*- 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_StaticLibrary_StaticLibrary,zlib_x64)) + +$(eval $(call gb_StaticLibrary_set_x64,zlib_x64,YES)) + +$(eval $(call gb_StaticLibrary_use_unpacked,zlib_x64,zlib)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib_x64)) + +$(eval $(call gb_StaticLibrary_set_include,zlib_x64,\ + -I$(call gb_UnpackedTarball_get_dir,zlib) \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,zlib_x64,\ + UnpackedTarball/zlib/x64/adler32 \ + UnpackedTarball/zlib/x64/compress \ + UnpackedTarball/zlib/x64/crc32 \ + UnpackedTarball/zlib/x64/deflate \ + UnpackedTarball/zlib/x64/inffast \ + UnpackedTarball/zlib/x64/inflate \ + UnpackedTarball/zlib/x64/inftrees \ + UnpackedTarball/zlib/x64/trees \ + UnpackedTarball/zlib/x64/zutil \ +)) + +ifeq ($(ENABLE_DEBUG),TRUE) +$(eval $(call gb_StaticLibrary_add_cflags,zlib_x64,-DZLIB_DEBUG)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/zlib/UnpackedTarball_zlib.mk b/external/zlib/UnpackedTarball_zlib.mk new file mode 100644 index 000000000..e74039d25 --- /dev/null +++ b/external/zlib/UnpackedTarball_zlib.mk @@ -0,0 +1,25 @@ +# -*- 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,zlib)) + +$(eval $(call gb_UnpackedTarball_set_tarball,zlib,$(ZLIB_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_post_action,zlib,\ + mkdir -p x64 && \ + cp $(addsuffix .c,adler32 compress crc32 deflate inffast inflate inftrees trees zutil) x64 \ +)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,zlib, \ + external/zlib/ubsan.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/zlib/ubsan.patch b/external/zlib/ubsan.patch new file mode 100644 index 000000000..2d7ff8d67 --- /dev/null +++ b/external/zlib/ubsan.patch @@ -0,0 +1,11 @@ +--- trees.c ++++ trees.c +@@ -870,7 +870,7 @@ + bi_windup(s); /* align on byte boundary */ + put_short(s, (ush)stored_len); + put_short(s, (ush)~stored_len); +- zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len); ++ if (stored_len != 0) zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len); + s->pending += stored_len; + #ifdef ZLIB_DEBUG + s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; |