[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 6 commits - canvas/Library_vclcanvas.mk configure.ac external/lcms2 external/openssl external/pdfium external/python3

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Tue May 25 13:04:50 UTC 2021


 canvas/Library_vclcanvas.mk                 |    7 ++++++-
 configure.ac                                |    2 +-
 external/lcms2/ExternalPackage_lcms2.mk     |    4 +++-
 external/openssl/ExternalProject_openssl.mk |    4 +++-
 external/pdfium/UnpackedTarball_pdfium.mk   |    1 +
 external/pdfium/bsd-time.patch.1            |   12 ++++++++++++
 external/python3/ExternalPackage_python3.mk |    8 +++++++-
 7 files changed, 33 insertions(+), 5 deletions(-)

New commits:
commit f48b5efa7a31bddfcaec6b5fc1a4217d35052c70
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue May 25 14:35:57 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 25 14:43:29 2021 +0200

    no need to link to epoxy when GUI is disabled
    
    Change-Id: I3a4b4fca7add24a1642c31d773ad1e1a9e53d439

diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 8c5f31484d56..26aa9bec96a8 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -30,9 +30,14 @@ $(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas
 
 $(eval $(call gb_Library_use_externals,vclcanvas,\
 	boost_headers \
-	epoxy \
 ))
 
+ifeq ($(DISABLE_GUI),)
+$(eval $(call gb_Library_use_externals,vclcanvas,\
+     epoxy \
+ ))
+endif
+
 $(eval $(call gb_Library_use_sdk_api,vclcanvas))
 
 $(eval $(call gb_Library_use_libraries,vclcanvas,\
commit eaff739eaf3103c1e8bb2b6f4962a6b78d2d248f
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue May 25 14:12:12 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 25 14:43:28 2021 +0200

    FreeBSD: fix python3 packaging
    
    Change-Id: Ia5a32c8c33f74cb00c3c270774e5982443298243

diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk
index 4886b123cab4..aa3d8d93d77d 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -105,7 +105,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor
 	LO_lib/_sha3.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \
 	LO_lib/_sha512.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \
 	LO_lib/_socket.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \
-	LO_lib/spwd.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \
+	$(if $(filter FREEBSD,$(OS)),, LO_lib/spwd.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so) \
 	$(if $(DISABLE_OPENSSL),, \
 		LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \
 	) \
@@ -134,6 +134,11 @@ endif
 endif
 
 # that one is generated...
+ifeq ($(HOST_PLATFORM),x86_64-unknown-freebsd12.2)
+$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+	LO_lib/_sysconfigdata__freebsd12_.py \
+))
+else
 # note: python configure overrides config.guess with something that doesn't
 # put -pc in its linux platform triplets, so filter that...
 ifneq ($(OS),WNT)
@@ -141,6 +146,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor
 	LO_lib/_sysconfigdata__$(python3_MACHDEP)_$(subst i686,i386,$(subst -pc,,$(HOST_PLATFORM))).py \
 ))
 endif
+endif
 
 # packages not shipped:
 # dbm, sqlite3 - need some database stuff
commit 753ae339389daa622cc4a1e926be147b2925165e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon May 24 20:16:45 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 25 14:43:28 2021 +0200

    Fix pdfium build on BSD
    
    Change-Id: I30b10e71c120e59d1da7b69728c742afcb4bbe83

diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk
index 8eb17e1ddb59..ae6283b16851 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -22,6 +22,7 @@ pdfium_patches += SignatureGetDocMDPPermission.patch.1
 pdfium_patches += cg-instead-of-carbon.patch.1
 # Android NDK 19 - that is known to work well - does not have 2 defines
 pdfium_patches += AndroidNDK19.patch.1
+pdfium_patches += bsd-time.patch.1
 
 # Work around <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94141> "c++20 rewritten operator==
 # recursive call mixing friend and external operators for template class" in GCC with
diff --git a/external/pdfium/bsd-time.patch.1 b/external/pdfium/bsd-time.patch.1
new file mode 100644
index 000000000000..7c08071d8d20
--- /dev/null
+++ b/external/pdfium/bsd-time.patch.1
@@ -0,0 +1,12 @@
+diff -ur pdfium.org/core/fxcrt/cfx_datetime.cpp pdfium/core/fxcrt/cfx_datetime.cpp
+--- pdfium.org/core/fxcrt/cfx_datetime.cpp	2021-05-24 18:49:42.500750000 +0200
++++ pdfium/core/fxcrt/cfx_datetime.cpp	2021-05-24 18:50:28.360272000 +0200
+@@ -10,7 +10,7 @@
+ #include "core/fxcrt/fx_system.h"
+ 
+ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
+-    defined(OS_APPLE) || defined(OS_ASMJS)
++    defined(OS_APPLE) || defined(OS_ASMJS) || defined(OS_BSD)
+ #include <sys/time.h>
+ #include <time.h>
+ #endif
commit 63ea4096fd91627737f602f8bd74c36d5bcc75f2
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon May 24 20:15:14 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 25 14:43:28 2021 +0200

    FreeBSD: fix OPENSSL_PLATFORM
    
    Change-Id: I0f48d572edaed7e996be7a75d524c7d540a76ecd

diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index d0790e5e5b7b..4f78cd6717ed 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -26,7 +26,9 @@ OPENSSL_PLATFORM := \
         $(if $(filter GNU/kFreeBSD,$(shell uname)),\
           debian-kfreebsd-amd64\
         ,\
-          $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, linux-generic64) no-asm\
+          $(if $(filter FreeBSD,$(shell uname)), BSD-x86_64,\
+            $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, linux-generic64) no-asm\
+          )\
         )\
       ,\
         $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32, linux-generic32)\
commit 248dfc71238238f453f45c3e7f0c33fe9178aab8
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon May 24 20:14:37 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 25 14:43:28 2021 +0200

    FreeBSD: fix packaging of liblcms2.so.2
    
    Change-Id: I820a44ff5ae4ab6a3a0201857ceaa2017dbae54d

diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk
index c0cdc098b6e2..89ff01e1d7c4 100644
--- a/external/lcms2/ExternalPackage_lcms2.mk
+++ b/external/lcms2/ExternalPackage_lcms2.mk
@@ -20,7 +20,9 @@ $(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2-2.dl
 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
+else ifeq ($(OS),FREEBSD)
+$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2))
+else  # $(OS) != WNT/MACOSX/FREEBSD
 $(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.10))
 endif # $(OS)
 endif # $(DISABLE_DYNLOADING)
commit 30671a665e745aae4b81a03646ee4a4864ca1f39
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon May 24 20:12:36 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 25 14:43:28 2021 +0200

    FreeBSD: evaluate --with-gnu-patch
    
    Change-Id: I41e2cc8dc74022c840dac6355ed29cc0c4c40b17

diff --git a/configure.ac b/configure.ac
index 51933e069255..ee59b965a6c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11114,7 +11114,7 @@ if test -z "$PATCH"; then
 fi
 
 dnl On Solaris or macOS, check if --with-gnu-patch was used
-if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then
+if test "$_os" = "SunOS" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
     if test -z "$with_gnu_patch"; then
         GNUPATCH=$PATCH
     else


More information about the Libreoffice-commits mailing list