commit: 75205af3b1534dd771c7c4c1d1b54dcbd6802c8a Author: Louis Leseur <louis.leseur <AT> gmail <DOT> com> AuthorDate: Sun Jun 7 20:08:52 2020 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Jun 10 15:10:36 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=75205af3
app-office/libreoffice: bump to 6.4.4.2 Synced with ::gentoo, using Alpine patches. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Louis Leseur <louis.leseur <AT> gmail.com> Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> app-office/libreoffice/Manifest | 5 +- .../files/libreoffice-6.4.2.2-poppler-0.86.patch | 15 +++ .../files/libreoffice-6.4.3.2-boost-1.73.patch | 118 +++++++++++++++++++++ .../files/libreoffice-6.4.4.2-linux-musl.patch | 60 +++++++++++ ...e-6.3.4.2.ebuild => libreoffice-6.4.4.2.ebuild} | 56 +++++----- app-office/libreoffice/metadata.xml | 1 - 6 files changed, 220 insertions(+), 35 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 1083824..3d478bb 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -2,7 +2,8 @@ DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f +DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B b2cb329877426861e0245747ac1e8f1275ca7428b3c6768af60dec5c9bb46e93a3fee81fc77257e151604b5f6748c9f29582e9fccc2a4088747c95fe5f673124 SHA512 314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a -DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2 +DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f -DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9 +DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 73ef558b830e0e2899eb72727e0eb81327807ff2d474c8d956700a09bcadc73cbff26688063f91d3a496afa55ab9a7d4847d84334b89fe4fafe17fb445fbb33d SHA512 7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d diff --git a/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch b/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch new file mode 100644 index 0000000..c56ba89 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch @@ -0,0 +1,15 @@ +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index e9c2a407c279..16ad04bf660a 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*) + if (!(pAction && pAction->getKind() == actionURI)) + return; + +-#if POPPLER_CHECK_VERSION(0, 72, 0) ++#if POPPLER_CHECK_VERSION(0, 86, 0) ++ const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str(); ++#elif POPPLER_CHECK_VERSION(0, 72, 0) + const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str(); + #else + const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString(); diff --git a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch new file mode 100644 index 0000000..0eb4069 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch @@ -0,0 +1,118 @@ +From 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <[email protected]> +Date: Wed, 29 Jan 2020 12:44:52 +0000 +Subject: replace boost::bimap in sdext pdfimport +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +the error message with boost 1.69 and gcc 10 is so ungodly its easier to throw +bimap out and use something simpler + +Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87683 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara <[email protected]> +--- + sdext/source/pdfimport/inc/pdfiprocessor.hxx | 12 ++++-------- + sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 ++++++++++++--------- + 2 files changed, 16 insertions(+), 17 deletions(-) + +diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx +index 89f9d601b7b0..9e08d6a6a765 100644 +--- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx ++++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx +@@ -37,9 +37,6 @@ + #include "treevisitorfactory.hxx" + #include "genericelements.hxx" + +-#include <boost/bimap/bimap.hpp> +-#include <boost/bimap/unordered_set_of.hpp> +- + namespace pdfi + { + +@@ -160,10 +157,8 @@ namespace pdfi + typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap; + typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; + +- typedef boost::bimaps::bimap< +- boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>, +- boost::bimaps::unordered_set_of<sal_Int32> +- > GCToIdBiMap; ++ typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap; ++ typedef std::unordered_map<GraphicsContext, sal_Int32, GraphicsContextHash> GCToIdMap; + + typedef std::vector<GraphicsContext> GraphicsContextStack; + +@@ -178,7 +173,8 @@ namespace pdfi + + GraphicsContextStack m_aGCStack; + sal_Int32 m_nNextGCId; +- GCToIdBiMap m_aGCToId; ++ IdToGCMap m_aIdToGC; ++ GCToIdMap m_aGCToId; + + ImageContainer m_aImages; + +diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx +index c6baa7fee8b2..ed2eaf6510b9 100644 +--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx ++++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx +@@ -54,6 +54,7 @@ namespace pdfi + m_aFontToId(), + m_aGCStack(), + m_nNextGCId( 1 ), ++ m_aIdToGC(), + m_aGCToId(), + m_aImages(), + m_nPages(0), +@@ -65,12 +66,13 @@ namespace pdfi + aDefFont.isBold = false; + aDefFont.isItalic = false; + aDefFont.size = 10*PDFI_OUTDEV_RESOLUTION/72; +- m_aIdToFont[ 0 ] = aDefFont; +- m_aFontToId[ aDefFont ] = 0; ++ m_aIdToFont.insert({0, aDefFont}); ++ m_aFontToId.insert({aDefFont, 0}); + + GraphicsContext aDefGC; + m_aGCStack.push_back( aDefGC ); +- m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0)); ++ m_aGCToId.insert({aDefGC, 0}); ++ m_aIdToGC.insert({0, aDefGC}); + } + + void PDFIProcessor::setPageNum( sal_Int32 nPages ) +@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const + sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC ) + { + sal_Int32 nGCId = 0; +- auto it = m_aGCToId.left.find( rGC ); +- if( it != m_aGCToId.left.end() ) ++ auto it = m_aGCToId.find( rGC ); ++ if( it != m_aGCToId.end() ) + nGCId = it->second; + else + { +- m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId)); ++ m_aGCToId.insert({rGC, m_nNextGCId}); ++ m_aIdToGC.insert({m_nNextGCId, rGC}); + nGCId = m_nNextGCId; + m_nNextGCId++; + } +@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC ) + + const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const + { +- auto it = m_aGCToId.right.find( nGCId ); +- if( it == m_aGCToId.right.end() ) +- it = m_aGCToId.right.find( 0 ); ++ auto it = m_aIdToGC.find( nGCId ); ++ if( it == m_aIdToGC.end() ) ++ it = m_aIdToGC.find( 0 ); + return it->second; + } + +-- +cgit v1.2.1 diff --git a/app-office/libreoffice/files/libreoffice-6.4.4.2-linux-musl.patch b/app-office/libreoffice/files/libreoffice-6.4.4.2-linux-musl.patch new file mode 100644 index 0000000..fd71d97 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.4.4.2-linux-musl.patch @@ -0,0 +1,60 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -612,7 +612,7 @@ + fi + ;; + +-linux-gnu*|k*bsd*-gnu*) ++linux-gnu*|linux-musl*|k*bsd*-gnu*) + build_gstreamer_1_0=yes + test_kf5=yes + test_gtk3_kde5=yes +@@ -4353,7 +4353,7 @@ + esac + ;; + +-linux-gnu*) ++linux-gnu*|linux-musl*) + COM=GCC + USING_X11=TRUE + OS=LINUX +@@ -7672,7 +7672,7 @@ + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" + ;; + +- linux-gnu*) ++ linux-gnu*|linux-musl*) + JAVAINC="-I$JAVA_HOME/include" + JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" +@@ -10260,21 +10260,6 @@ + AC_SUBST(ENABLE_LIBNUMBERTEXT) + AC_SUBST(LIBNUMBERTEXT_CFLAGS) + +-dnl *************************************** +-dnl testing libc version for Linux... +-dnl *************************************** +-if test "$_os" = "Linux"; then +- AC_MSG_CHECKING([whether libc is >= 2.1.1]) +- exec 6>/dev/null # no output +- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC) +- exec 6>&1 # output on again +- if test "$HAVE_LIBC"; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_ERROR([no, upgrade libc]) +- fi +-fi +- + dnl ========================================= + dnl Check for uuidgen + dnl ========================================= +@@ -12812,7 +12812,7 @@ + + case "$host_os" in + +- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) ++ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) + if test "$ENABLE_JAVA" != ""; then + pathmunge "$JAVA_HOME/bin" "after" + fi diff --git a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild b/app-office/libreoffice/libreoffice-6.4.4.2.ebuild similarity index 92% rename from app-office/libreoffice/libreoffice-6.3.4.2.ebuild rename to app-office/libreoffice/libreoffice-6.4.4.2.ebuild index d2a9330..955acac 100644 --- a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.4.4.2.ebuild @@ -44,6 +44,8 @@ unset DEV_URI # These are bundles that can't be removed for now due to huge patchsets. # If you want them gone, patches are welcome. ADDONS_SRC=( + # QR code generating library for >=libreoffice-6.4 + "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz" "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" # no release for 8 years, should we package it? "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" @@ -62,12 +64,13 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird -googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test +IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) + gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -78,8 +81,9 @@ RESTRICT="!test? ( test )" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" + [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" BDEPEND=" dev-util/intltool @@ -114,13 +118,13 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl - dev-libs/boost:=[nls] + >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error - >=dev-libs/liborcus-0.14.0 + >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt @@ -153,9 +157,7 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/libXrandr x11-libs/libXrender accessibility? ( - $(python_gen_cond_dep ' - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - ') + $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]') ) bluetooth? ( dev-libs/glib:2 @@ -163,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) - dbus? ( sys-apps/dbus ) + dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf @@ -182,11 +184,6 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/gtk+:3 x11-libs/pango ) - gtk2? ( - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - x11-libs/pango - ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -215,7 +212,7 @@ DEPEND="${COMMON_DEPEND} dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 - >=dev-util/mdds-1.4.1:1= + dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto @@ -223,7 +220,7 @@ DEPEND="${COMMON_DEPEND} x11-libs/libXtst java? ( dev-java/ant-core - >=virtual/jdk-1.6 + >=virtual/jdk-1.8 ) test? ( app-crypt/gnupg @@ -238,7 +235,7 @@ RDEPEND="${COMMON_DEPEND} !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.6 ) + java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) " if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then @@ -257,14 +254,15 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" - # master branch - "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422 - "${FILESDIR}/${P}-poppler-0.83.patch" + # git master + "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806 + + # TODO: upstream (for now taken from Arch Linux) + "${FILESDIR}/${PN}-6.4.2.2-poppler-0.86.patch" # bug 711102 # musl compatibility by AlpineLinux - "${FILESDIR}/${PN}-6.1.4.2-linux-musl.patch" + "${FILESDIR}/${PN}-6.4.4.2-linux-musl.patch" "${FILESDIR}/${PN}-6.1.4.2-musl-fix-execinfo.patch" - "${FILESDIR}/${PN}-6.1.4.2-musl-fix-includes.patch" "${FILESDIR}/${PN}-6.1.4.2-disable-liborcus-unittest.patch" "${FILESDIR}/${PN}-6.1.4.2-musl-stacksize.patch" ) @@ -288,12 +286,6 @@ pkg_pretend() { use java || ewarn "Without java, several wizards are not going to be available." - if has_version "<app-office/libreoffice-5.3.0[firebird]"; then - ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" - ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." - ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"; - fi - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend } @@ -405,6 +397,7 @@ src_configure() { # --without-system-sane: just sane.h header that is used for scan in writer, # not linked or anything else, worthless to depend on # --disable-pdfium: not yet packaged + # --without-system-qrencode: has no real build system and LO is the only user local myeconfargs=( --with-system-dicts --with-system-epoxy @@ -425,7 +418,6 @@ src_configure() { --disable-dependency-tracking --disable-epm --disable-fetch-external - --disable-gstreamer-0-10 --disable-gtk3-kde5 --disable-online-update --disable-openssl @@ -450,6 +442,7 @@ src_configure() { --without-helppack-integration --with-system-gpgmepp --without-system-sane + --without-system-qrcodegen $(use_enable bluetooth sdremote-bluetooth) $(use_enable coinmp) $(use_enable cups) @@ -459,8 +452,7 @@ src_configure() { $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) - $(use_enable gtk2 gtk) - $(use_enable kde kde5) + $(use_enable kde kf5) $(use_enable kde qt5) $(use_enable ldap) $(use_enable odk) @@ -533,7 +525,7 @@ src_test() { src_install() { # This is not Makefile so no buildserver - make DESTDIR="${D}" distro-pack-install -o build -o check || die + emake DESTDIR="${D}" distro-pack-install -o build -o check # bug 593514 if use gtk; then diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 38a66bc..e133259 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -13,7 +13,6 @@ version</longdescription> <use> <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="gtk2">Enable legacy gtk2 frontend</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>
