libreoffice: update to 7.5.5.2

iigs

2023-08-04 4d8e23f86ea5020eaeee0d06807349987a6f643b

libreoffice: update to 7.5.5.2

* Switch to openssl 3.1
* Use parallel build
* Use correct libraries for downloads
* Use human version for repology.org tracking

Update pkg5

Update results-all.master

 components/desktop/libreoffice/Makefile

@@ -13,21 +13,24 @@
# Copyright 2022 Daniel Bell
#

USE_OPENSSL11= yes
OPENSSL_VERSION= 3.1
USE_PARALLEL_BUILD = yes
include ../../../make-rules/shared-macros.mk
BITS=64

COMPONENT_NAME=         libreoffice
COMPONENT_VERSION=      7.5.4
COMPONENT_VERSION=      7.5.5
COMPONENT_RC_VERSION=    2
COMPONENT_FULL_VERSION=$(COMPONENT_VERSION).$(COMPONENT_RC_VERSION)
# repology.org uses HUMAN_VERSION
HUMAN_VERSION=          $(COMPONENT_FULL_VERSION)
COMPONENT_SUMMARY=      LibreOffice is a powerful office suite
COMPONENT_PROJECT_URL=  https://www.libreoffice.org/
COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_FULL_VERSION)
COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_URL=  https://download.documentfoundation.org/libreoffice/src/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).asc
COMPONENT_ARCHIVE_HASH= sha256:4f2dbe571e2116ce11df71d72b4ae03f7a3ca82c72578c1724afb3bd26d38d08
COMPONENT_ARCHIVE_HASH= sha256:6628dfd2a21041a7c5bb6d72733e0fd52efa7959c95084fcd4d96cc4a61b0561
COMPONENT_FMRI=         desktop/office/libreoffice
COMPONENT_CLASSIFICATION= Applications/Office
COMPONENT_LICENSE=      MPL2.0
@@ -73,8 +76,8 @@
COMPONENT_ARCHIVE_HASH_10 = sha256:6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
COMPONENT_ARCHIVE_URL_10 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_10)

COMPONENT_ARCHIVE_11 = CoinMP-1.8.4.tgz
COMPONENT_ARCHIVE_HASH_11 = sha256:3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d
COMPONENT_ARCHIVE_11 = CoinMP-1.7.6.tgz
COMPONENT_ARCHIVE_HASH_11 = sha256:86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f
COMPONENT_ARCHIVE_URL_11 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_11)

COMPONENT_ARCHIVE_12 = e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz
@@ -93,24 +96,24 @@
COMPONENT_ARCHIVE_HASH_15 = sha256:5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0
COMPONENT_ARCHIVE_URL_15 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_15)

COMPONENT_ARCHIVE_16 = liborcus-0.18.1.tar.xz
COMPONENT_ARCHIVE_HASH_16 = sha256:6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb
COMPONENT_ARCHIVE_16 = liborcus-0.17.2.tar.bz2
COMPONENT_ARCHIVE_HASH_16 = sha256:2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143
COMPONENT_ARCHIVE_URL_16 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_16)

COMPONENT_ARCHIVE_17 = QR-Code-generator-1.4.0.tar.gz
COMPONENT_ARCHIVE_HASH_17 = sha256:fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
COMPONENT_ARCHIVE_URL_17 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_17)

COMPONENT_ARCHIVE_18 = xmlsec1-1.3.1.tar.gz
COMPONENT_ARCHIVE_HASH_18 = sha256:605e2b2fbe4301ad859d4cabf5dff61212b14f51e1f700601954612a956ed2ad
COMPONENT_ARCHIVE_18 = xmlsec1-1.2.37.tar.gz
COMPONENT_ARCHIVE_HASH_18 = sha256:5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
COMPONENT_ARCHIVE_URL_18 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_18)

COMPONENT_ARCHIVE_19 = libreoffice-translations-$(COMPONENT_FULL_VERSION).tar.xz
COMPONENT_ARCHIVE_HASH_19 = sha256:7eb264c2cd66f028831535bec0d3fcdfb687fae4deb77d200cfe4034ca3a10ad
COMPONENT_ARCHIVE_HASH_19 = sha256:24b5c791a17128361b5f3c8538348002a714d0ba2aab37e3bf10e16b7ac049b7
COMPONENT_ARCHIVE_URL_19 = https://download.documentfoundation.org/libreoffice/src/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE_19)

COMPONENT_ARCHIVE_20 = libreoffice-dictionaries-$(COMPONENT_FULL_VERSION).tar.xz
COMPONENT_ARCHIVE_HASH_20 = sha256:4f2dbe571e2116ce11df71d72b4ae03f7a3ca82c72578c1724afb3bd26d38d08
COMPONENT_ARCHIVE_HASH_20 = sha256:33c023d3e5abe5649350ae1242fcd5d6c069066f283db967b6aab35aa4857504
COMPONENT_ARCHIVE_URL_20 = https://download.documentfoundation.org/libreoffice/src/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE_20)

#COMPONENT_ARCHIVE_21 = boost_1_69_0.tar.bz2
@@ -121,21 +124,20 @@
COMPONENT_ARCHIVE_HASH_22 = sha256:cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678
COMPONENT_ARCHIVE_URL_22 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_22)

COMPONENT_ARCHIVE_23 = zxing-cpp-2.0.0.tar.gz
COMPONENT_ARCHIVE_HASH_23 = sha256:12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76
COMPONENT_ARCHIVE_23 = zxing-cpp-1.4.0.tar.gz
COMPONENT_ARCHIVE_HASH_23 = sha256:126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862
COMPONENT_ARCHIVE_URL_23 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_23)

COMPONENT_ARCHIVE_24 = box2d-2.4.1.tar.gz
COMPONENT_ARCHIVE_HASH_24 = sha256:d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2
COMPONENT_ARCHIVE_URL_24 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_24)


COMPONENT_ARCHIVE_25 = dtoa-20180411.tgz
COMPONENT_ARCHIVE_HASH_25 = sha256:0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
COMPONENT_ARCHIVE_URL_25 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_25)

COMPONENT_ARCHIVE_26 = skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz
COMPONENT_ARCHIVE_HASH_26 = sha256:0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9
COMPONENT_ARCHIVE_26 = skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
COMPONENT_ARCHIVE_HASH_26 = sha256:c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9
COMPONENT_ARCHIVE_URL_26 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_26)

COMPONENT_ARCHIVE_27 = libcmis-0.5.2.tar.xz
@@ -150,8 +152,8 @@
COMPONENT_ARCHIVE_HASH_29 = sha256:8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
COMPONENT_ARCHIVE_URL_29 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_29)

COMPONENT_ARCHIVE_30 = libgpg-error-1.46.tar.bz2
COMPONENT_ARCHIVE_HASH_30 = sha256:b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d
COMPONENT_ARCHIVE_30 = libgpg-error-1.43.tar.bz2
COMPONENT_ARCHIVE_HASH_30 = sha256:a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
COMPONENT_ARCHIVE_URL_30 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_30)
# ignore archive 21 (boost)
NUM_EXTRA_ARCHIVES = $(shell seq 1 20) $(shell 22 30)
@@ -274,11 +276,16 @@
CONFIGURE_OPTIONS += --enable-python=no
CONFIGURE_OPTIONS += --disable-cve-tests

ifdef DEBUG
CONFIGURE_OPTIONS += --enable-debug
endif

COMPONENT_BUILD_ENV += GMAKE_OPTIONS='VERBOSE=1 gb_SUPPRESS_TESTS=x'

COMPONENT_INSTALL_TARGETS = distro-pack-install

LIBREOFFICE_PROGRAM_DIR = /usr/lib/amd64/libreoffice/program
LIBREOFFICE_SHARE_DIR = /usr/lib/amd64/libreoffice/share

NSS_LIB_DIR=/usr/lib/mps/amd64

@@ -288,6 +295,10 @@
        /usr/bin/elfedit -e 'dyn:value -s  RPATH "$(GCC_LIBDIR):$(LIBREOFFICE_PROGRAM_DIR):$(NSS_LIB_DIR):$(JPEG_LIBDIR):$(MARIADB_LIBDIR)"' $$file ; \
    done ; 

# Replace "#!/usr/bin/env ..." shebang line with properly versioned one
COMPONENT_POST_INSTALL_ACTION += \
    $(GSED) -i 's/env\ python3/python$(PYTHON_VERSION)/' \
        $(PROTO_DIR)$(LIBREOFFICE_SHARE_DIR)/extensions/dict-pt-BR/test_compile_rules.py ;

# debug specific test
testtrace:
@@ -352,7 +363,7 @@
REQUIRED_PACKAGES += library/nspr
REQUIRED_PACKAGES += library/openldap
REQUIRED_PACKAGES += library/print/cups-libs
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/security/openssl-31
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library

 components/desktop/libreoffice/pkg5

@@ -50,7 +50,7 @@
        "library/nspr",
        "library/openldap",
        "library/print/cups-libs",
        "library/security/openssl-11",
        "library/security/openssl-31",
        "library/zlib",
        "shell/ksh93",
        "system/library",
@@ -77,4 +77,4 @@
        "desktop/office/libreoffice"
    ],
    "name": "libreoffice"
}
}

 components/desktop/libreoffice/test/results-all.master

Diff too large