commit: 1e6582952369e1fd90f507f94853263ce07089c9 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sat Nov 21 15:05:38 2020 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sat Nov 21 15:07:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e658295
app-office/libreoffice: Version bump (no keywords, for testing) Bug: https://bugs.gentoo.org/739134 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> app-office/libreoffice/Manifest | 2 + ...-7.0.9999.ebuild => libreoffice-7.0.3.1.ebuild} | 58 ++++++++++++++++++++-- app-office/libreoffice/libreoffice-7.0.9999.ebuild | 54 +++++++++++++++++++- app-office/libreoffice/libreoffice-9999.ebuild | 54 +++++++++++++++++++- app-office/libreoffice/metadata.xml | 2 + 5 files changed, 162 insertions(+), 8 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 77502cb3e9f..63ba9802281 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -19,7 +19,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 DIST libreoffice-6.4.6.2.tar.xz 232180876 BLAKE2B b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654 SHA512 377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8 +DIST libreoffice-7.0.3.1.tar.xz 240706432 BLAKE2B 4bf075fedb445a60a971adfb029fb7843afab1ee2009d32b149c91970d8eae990e4ac3ea7075d58815288f1f174846e0e9de7ce00655840ad97622a3790b43a2 SHA512 1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501 DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3 +DIST libreoffice-help-7.0.3.1.tar.xz 110855688 BLAKE2B 3b0e845087fe0bd25ad3c06b8a8eac548f05568cf279efc10f7190ee51e8a9922c64749ad57c21b150aaac9b3249a6e184583f389a191fc6b86128153ff363be SHA512 1acbc7575da99ce0a09a3092a8612f47c432ffd8d4b6029c885c782a857c6b0812bb2eee3873b0cdfa41ee42f84a0843c3d06109ccb651b5bba5ade1a6725a78 DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1 diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild similarity index 92% copy from app-office/libreoffice/libreoffice-7.0.9999.ebuild copy to app-office/libreoffice/libreoffice-7.0.3.1.ebuild index f2d22894b1f..63c50e62f52 100644 --- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild @@ -82,8 +82,8 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test +IUSE="accessibility base bluetooth +branding clang coinmp +cups +dbus debug eds firebird +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -101,8 +101,8 @@ RESTRICT="!test? ( test )" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -[[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +#[[ ${MY_PV} == *9999* ]] || \ +#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" BDEPEND=" dev-util/intltool @@ -182,6 +182,11 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/glib:2 net-wireless/bluez ) + clang? ( + sys-devel/clang + sys-devel/llvm + sys-devel/lld + ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) @@ -374,6 +379,50 @@ src_configure() { local google_default_client_id="329227923882.apps.googleusercontent.com" local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" + # Show flags set at the beginning + einfo "Current CFLAGS: ${CFLAGS}" + einfo "Current LDFLAGS: ${LDFLAGS}" + + local have_switched_compiler= + if use clang && ! tc-is-clang ; then + # Force clang + einfo "Enforcing the use of clang due to USE=clang ..." + have_switched_compiler=yes + AR=llvm-ar + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + NM=llvm-nm + RANLIB=llvm-ranlib + elif ! use clang && ! tc-is-gcc ; then + # Force gcc + have_switched_compiler=yes + einfo "Enforcing the use of gcc due to USE=-clang ..." + AR=gcc-ar + CC=${CHOST}-gcc + CXX=${CHOST}-g++ + NM=gcc-nm + RANLIB=gcc-ranlib + fi + export LO_CLANG_CC=${CC} + export LO_CLANG_CXX=${CXX} + + if [[ -n "${have_switched_compiler}" ]] ; then + # Because we switched active compiler we have to ensure + # that no unsupported flags are set + strip-unsupported-flags + fi + + # Show flags set at the beginning + einfo " Used CFLAGS: ${CFLAGS}" + einfo " Used LDFLAGS: ${LDFLAGS}" + + # Ensure we use correct toolchain + tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG + + if use vulkan && ! use clang ; then + ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang." + fi + # optimization flags export GMAKE_OPTIONS="${MAKEOPTS}" # System python enablement: @@ -465,6 +514,7 @@ src_configure() { $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) + $(use_enable vulkan skia) $(use_with accessibility lxml) $(use_with coinmp system-coinmp) $(use_with googledrive gdrive-client-id ${google_default_client_id}) diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild index f2d22894b1f..552b65b8bbd 100644 --- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild @@ -82,8 +82,8 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test +IUSE="accessibility base bluetooth +branding clang coinmp +cups +dbus debug eds firebird +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -182,6 +182,11 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/glib:2 net-wireless/bluez ) + clang? ( + sys-devel/clang + sys-devel/llvm + sys-devel/lld + ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) @@ -374,6 +379,50 @@ src_configure() { local google_default_client_id="329227923882.apps.googleusercontent.com" local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" + # Show flags set at the beginning + einfo "Current CFLAGS: ${CFLAGS}" + einfo "Current LDFLAGS: ${LDFLAGS}" + + local have_switched_compiler= + if use clang && ! tc-is-clang ; then + # Force clang + einfo "Enforcing the use of clang due to USE=clang ..." + have_switched_compiler=yes + AR=llvm-ar + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + NM=llvm-nm + RANLIB=llvm-ranlib + elif ! use clang && ! tc-is-gcc ; then + # Force gcc + have_switched_compiler=yes + einfo "Enforcing the use of gcc due to USE=-clang ..." + AR=gcc-ar + CC=${CHOST}-gcc + CXX=${CHOST}-g++ + NM=gcc-nm + RANLIB=gcc-ranlib + fi + export LO_CLANG_CC=${CC} + export LO_CLANG_CXX=${CXX} + + if [[ -n "${have_switched_compiler}" ]] ; then + # Because we switched active compiler we have to ensure + # that no unsupported flags are set + strip-unsupported-flags + fi + + # Show flags set at the beginning + einfo " Used CFLAGS: ${CFLAGS}" + einfo " Used LDFLAGS: ${LDFLAGS}" + + # Ensure we use correct toolchain + tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG + + if use vulkan && ! use clang ; then + ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang." + fi + # optimization flags export GMAKE_OPTIONS="${MAKEOPTS}" # System python enablement: @@ -465,6 +514,7 @@ src_configure() { $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) + $(use_enable vulkan skia) $(use_with accessibility lxml) $(use_with coinmp system-coinmp) $(use_with googledrive gdrive-client-id ${google_default_client_id}) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index f4beb244dbf..d114626a09d 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -82,8 +82,8 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test +IUSE="accessibility base bluetooth +branding clang coinmp +cups +dbus debug eds firebird +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -182,6 +182,11 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/glib:2 net-wireless/bluez ) + clang? ( + sys-devel/clang + sys-devel/llvm + sys-devel/lld + ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) @@ -374,6 +379,50 @@ src_configure() { local google_default_client_id="329227923882.apps.googleusercontent.com" local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" + # Show flags set at the beginning + einfo "Current CFLAGS: ${CFLAGS}" + einfo "Current LDFLAGS: ${LDFLAGS}" + + local have_switched_compiler= + if use clang && ! tc-is-clang ; then + # Force clang + einfo "Enforcing the use of clang due to USE=clang ..." + have_switched_compiler=yes + AR=llvm-ar + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + NM=llvm-nm + RANLIB=llvm-ranlib + elif ! use clang && ! tc-is-gcc ; then + # Force gcc + have_switched_compiler=yes + einfo "Enforcing the use of gcc due to USE=-clang ..." + AR=gcc-ar + CC=${CHOST}-gcc + CXX=${CHOST}-g++ + NM=gcc-nm + RANLIB=gcc-ranlib + fi + export LO_CLANG_CC=${CC} + export LO_CLANG_CXX=${CXX} + + if [[ -n "${have_switched_compiler}" ]] ; then + # Because we switched active compiler we have to ensure + # that no unsupported flags are set + strip-unsupported-flags + fi + + # Show flags set at the beginning + einfo " Used CFLAGS: ${CFLAGS}" + einfo " Used LDFLAGS: ${LDFLAGS}" + + # Ensure we use correct toolchain + tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG + + if use vulkan && ! use clang ; then + ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang." + fi + # optimization flags export GMAKE_OPTIONS="${MAKEOPTS}" # System python enablement: @@ -465,6 +514,7 @@ src_configure() { $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) + $(use_enable vulkan skia) $(use_with accessibility lxml) $(use_with coinmp system-coinmp) $(use_with googledrive gdrive-client-id ${google_default_client_id}) diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 3afed225b93..4ac974303a8 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -12,10 +12,12 @@ computer. It will however make a snappier LibreOffice than the binary version</longdescription> <use> <flag name="base">Enable full support for LibreOffice Base databases (involves additional bundled libs)</flag> + <flag name="clang">Use Clang compiler instead of GCC</flag> <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag> <flag name="googledrive">Enable support for remote files on Google Drive</flag> <flag name="mariadb">Prefer mariadb connector over mysql connector</flag> <flag name="odk">Build the Office Development Kit</flag> <flag name="pdfimport">Enable PDF import via the Poppler library</flag> + <flag name="vulkan">Enable Vulkan usage via the skia library (clang recommended)</flag> </use> </pkgmetadata>
