From f7b54dccb3b4044abdba89d4ee5adbc5895f5035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 14 May 2022 13:54:46 -0300 Subject: [PATCH 1/5] mdds: update to 2.0.3. --- srcpkgs/mdds/patches/configure.patch | 27 +++++++++++++++++++++++++++ srcpkgs/mdds/template | 7 ++++--- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/mdds/patches/configure.patch diff --git a/srcpkgs/mdds/patches/configure.patch b/srcpkgs/mdds/patches/configure.patch new file mode 100644 index 000000000000..e838ac27a9de --- /dev/null +++ b/srcpkgs/mdds/patches/configure.patch @@ -0,0 +1,27 @@ +This patch is needed, otherwise the sanity test for cpp fails on cross builds: + +configure:5267: aarch64-linux-gnu-cpp -Wall -Wshadow -g -pedantic-errors -I/usr/include -I/usr/local/include conftest.c +In file included from /usr/include/features.h:489, + from /usr/include/bits/libc-header-start.h:33, + from /usr/include/limits.h:26, + from conftest.c:13: +/usr/include/gnu/stubs.h:7:11: fatal error: gnu/stubs-32.h: No such file or directory + 7 | # include + | ^~~~~~~~~~~~~~~~ +compilation terminated. + +Normally, this isn't an issue with the compiler itself, because we have a +wrapper that discards bad -I flags, but we don't have a cpp wrapper. + +diff --git a/configure.ac b/configure.ac +index 40569655..5a64324a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,7 +24,6 @@ AC_SUBST(QUICKCHECKDIR) + AX_CXX_COMPILE_STDCXX_17([noext], [mandatory]) + + CPPFLAGS="$CPPFLAGS -Wall -Wshadow -g -pedantic-errors" +-CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/local/include" + + AC_CHECK_SIZEOF([void *]) + CXXFLAGS="$CXXFLAGS -DSIZEOF_VOID_P=$ac_cv_sizeof_void_p" diff --git a/srcpkgs/mdds/template b/srcpkgs/mdds/template index ea40d874ad4d..3ce27a1a395c 100644 --- a/srcpkgs/mdds/template +++ b/srcpkgs/mdds/template @@ -5,16 +5,17 @@ # pkgname=mdds -version=1.5.0 -revision=3 +version=2.0.3 +revision=1 build_style=gnu-configure hostmakedepends="automake" +checkdepends="boost-devel" short_desc="Collection of multi-dimensional data structures and indexing algorithms" maintainer="Enno Boland " license="MIT" homepage="https://gitlab.com/mdds/mdds" distfiles="http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2" -checksum=144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d +checksum=9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5 post_install() { vlicense LICENSE From ab09ba7d814cb466f27130dfeff4d4e877b51978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 14 May 2022 13:56:44 -0300 Subject: [PATCH 2/5] libixion: update to 0.17.0. --- common/shlibs | 2 +- srcpkgs/libixion/patches/nullptr_t.patch | 11 ----------- srcpkgs/libixion/template | 6 +++--- 3 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 srcpkgs/libixion/patches/nullptr_t.patch diff --git a/common/shlibs b/common/shlibs index a95bc3054f14..7ec63427e5fc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2643,7 +2643,7 @@ libCbc.so.3 CoinMP-1.8.3_1 libOsiCommonTests.so.1 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 libmwaw-0.3.so.3 libmwaw-0.3.7_1 -libixion-0.16.so.0 libixion-0.16.1_1 +libixion-0.17.so.0 libixion-0.17.0_1 liborcus-parser-0.16.so.0 liborcus-0.16.1_1 liborcus-mso-0.16.so.0 liborcus-0.16.1_1 liborcus-0.16.so.0 liborcus-0.16.1_1 diff --git a/srcpkgs/libixion/patches/nullptr_t.patch b/srcpkgs/libixion/patches/nullptr_t.patch deleted file mode 100644 index 604ea075938e..000000000000 --- a/srcpkgs/libixion/patches/nullptr_t.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/libixion/model_context.cpp 2020-08-28 23:23:48.000000000 +0200 -+++ b/src/libixion/model_context.cpp 2021-03-01 16:14:44.955570528 +0100 -@@ -17,7 +17,7 @@ - - namespace ixion { - --model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {} -+model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {} - model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean) - { - value.boolean = b; diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index ce0f428979a2..37298a8b9427 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -1,7 +1,7 @@ # Template file for 'libixion' pkgname=libixion -version=0.16.1 -revision=3 +version=0.17.0 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="boost-devel fmt-devel mdds python3-devel spdlog" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="MPL-2.0" homepage="https://gitlab.com/ixion/ixion/" distfiles="http://kohei.us/files/ixion/src/${pkgname}-${version}.tar.xz" -checksum=426c643b3c346d546027c0226619abb2e59848e94470b9b5aa6365e26125089f +checksum=53c97139223f3b786d498f86512a20ee878fab0ef981947647aa116df7c4101e replaces="libixion11>=0" libixion-devel_package() { From d663f00f560461bca958e1a35ccf235092eb7f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 14 May 2022 13:58:00 -0300 Subject: [PATCH 3/5] libetonyek: rebuild for mdds-2.0.3. --- srcpkgs/libetonyek/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libetonyek/template b/srcpkgs/libetonyek/template index fd70de07e7f4..6efb93cb070a 100644 --- a/srcpkgs/libetonyek/template +++ b/srcpkgs/libetonyek/template @@ -1,9 +1,9 @@ # Template file for 'libetonyek' pkgname=libetonyek version=0.1.9 -revision=4 +revision=5 build_style=gnu-configure -configure_args="--with-mdds=1.5" +configure_args="--with-mdds=2.0" hostmakedepends="pkg-config" makedepends="libxml2-devel boost-devel libcppunit-devel librevenge-devel glm mdds liblangtag-devel" From 6d18ccd014601e3133053c2121b18ad42a939ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 14 May 2022 13:56:28 -0300 Subject: [PATCH 4/5] liborcus: update to 0.17.2. --- common/shlibs | 8 ++++---- srcpkgs/liborcus/template | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7ec63427e5fc..6e1b31639640 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2644,10 +2644,10 @@ libOsiCommonTests.so.1 CoinMP-1.8.3_1 libCbcSolver.so.3 CoinMP-1.8.3_1 libmwaw-0.3.so.3 libmwaw-0.3.7_1 libixion-0.17.so.0 libixion-0.17.0_1 -liborcus-parser-0.16.so.0 liborcus-0.16.1_1 -liborcus-mso-0.16.so.0 liborcus-0.16.1_1 -liborcus-0.16.so.0 liborcus-0.16.1_1 -liborcus-spreadsheet-model-0.16.so.0 liborcus-0.16.1_1 +liborcus-parser-0.17.so.0 liborcus-0.17.2_1 +liborcus-mso-0.17.so.0 liborcus-0.17.2_1 +liborcus-0.17.so.0 liborcus-0.17.2_1 +liborcus-spreadsheet-model-0.17.so.0 liborcus-0.17.2_1 libnumbertext-1.0.so.0 libnumbertext-1.0.4_1 libGeneratedSaxParser.so opencollada-0.0.20160223_1 libMathMLSolver.so opencollada-0.0.20160223_1 diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template index 2f5feb6f6e7d..cf4b938fe37a 100644 --- a/srcpkgs/liborcus/template +++ b/srcpkgs/liborcus/template @@ -1,7 +1,7 @@ # Template file for 'liborcus' pkgname=liborcus -version=0.16.1 -revision=2 +version=0.17.2 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python3" makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="MPL-2.0" homepage="https://gitlab.com/orcus/orcus" distfiles="http://kohei.us/files/orcus/src/liborcus-${version}.tar.xz" -checksum=a4b26b320d00bdfc769c3a03ed22bd5ad7e54a93dc6b1d00cd949f8f3519faae +checksum=30509d414e3cf439e0ae1e0c31b4b0ef5b2bb8e2b2404e3cb7d44a72162640ab replaces="liborcus11>=0" pre_configure() { From ce90c4482248480be640f7f7e5a03808720412e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sat, 14 May 2022 13:57:37 -0300 Subject: [PATCH 5/5] libreoffice: update to 7.3.3.2. --- .../0003-configure_ac-libc-version.patch | 27 ----------- srcpkgs/libreoffice/patches/kde-inc.patch | 22 --------- srcpkgs/libreoffice/template | 45 ++++++++++--------- 3 files changed, 24 insertions(+), 70 deletions(-) delete mode 100644 srcpkgs/libreoffice/patches/0003-configure_ac-libc-version.patch delete mode 100644 srcpkgs/libreoffice/patches/kde-inc.patch diff --git a/srcpkgs/libreoffice/patches/0003-configure_ac-libc-version.patch b/srcpkgs/libreoffice/patches/0003-configure_ac-libc-version.patch deleted file mode 100644 index 7cc1ce2d1957..000000000000 --- a/srcpkgs/libreoffice/patches/0003-configure_ac-libc-version.patch +++ /dev/null @@ -1,27 +0,0 @@ -Source: @pullmoll -Upstream: no -Reason: This test fails for Musl libc and we know we have a working libc - ---- a/configure.ac 2020-01-23 00:14:16.000000000 +0100 -+++ b/configure.ac 2020-01-30 00:23:00.859196125 +0100 -@@ -10233,18 +10233,10 @@ - AC_SUBST(LIBNUMBERTEXT_CFLAGS) - - dnl *************************************** --dnl testing libc version for Linux... -+dnl Always assume we have a working libc - 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 -+ HAVE_LIBC=yes; export HAVE_LIBC - fi - - dnl ========================================= diff --git a/srcpkgs/libreoffice/patches/kde-inc.patch b/srcpkgs/libreoffice/patches/kde-inc.patch deleted file mode 100644 index d01aba1e34cf..000000000000 --- a/srcpkgs/libreoffice/patches/kde-inc.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/configure.ac 2021-11-18 12:33:09.000000000 +0100 -+++ - 2022-03-20 22:27:09.688261731 +0100 -@@ -12788,7 +12788,7 @@ - kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel" - fi - -- kf5_test_include="KF5/kcoreaddons_version.h" -+ kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h" - kf5_test_library="libKF5CoreAddons.so" - kf5_libdirs="$qt5_libdir $kf5_libdirs" - ---- a/configure 2021-11-18 12:36:47.000000000 +0100 -+++ - 2022-03-20 22:27:22.080024887 +0100 -@@ -41089,7 +41089,7 @@ - kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel" - fi - -- kf5_test_include="KF5/kcoreaddons_version.h" -+ kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h" - kf5_test_library="libKF5CoreAddons.so" - kf5_libdirs="$qt5_libdir $kf5_libdirs" - diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 46066a6c0bb9..ae32ce44f3b7 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,13 +1,13 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=7.2.3.2 -revision=2 +version=7.3.3.2 +revision=1 build_style=meta make_build_target="build-nocheck" nocross="Several dependencies are nocross=yes" hostmakedepends="automake flex git gperf hyphen icu libtool openldap which gettext xz - perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip wget zip python3-setuptools + perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools fontforge python3-lxml" makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel @@ -15,12 +15,12 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel libepubgen-devel libetonyek-devel libexttextcat-devel libfbclient3-devel libfreehand-devel libgcrypt-devel libgltf-devel libldap-devel libmariadbclient-devel libmspub-devel - libmwaw-devel libnumbertext-devel libodfgen-devel liborcus-devel + libmwaw-devel libnumbertext-devel libodfgen-devel libopenjpeg2-devel liborcus-devel libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel postgresql-libs-devel python3-devel qt5-devel redland-devel sane-devel telepathy-glib-devel unixodbc-devel vigra-devel libcppunit-devel - qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel" + qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel" depends="libreoffice-common>=${version}_${revision}" depends+=" libreoffice-base>=${version}_${revision}" depends+=" libreoffice-calc>=${version}_${revision}" @@ -69,7 +69,7 @@ distfiles=" ${_addurl}/libcmis-0.5.2.tar.xz ${_addurl}/libstaroffice-0.0.7.tar.xz ${_addurl}/libzmf-0.0.2.tar.xz - ${_addurl}/pdfium-4500.tar.bz2 + ${_addurl}/pdfium-4699.tar.bz2 ${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar ${_exturl}/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar @@ -89,7 +89,7 @@ distfiles=" ${_addurl}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip ${_addurl}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_addurl}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz + ${_addurl}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz ${_addurl}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz ${_addurl}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz ${_addurl}/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip @@ -106,15 +106,15 @@ distfiles=" ${_addurl}/libre-hebrew-1.0.tar.gz ${_addurl}/alef-1.001.tar.gz ${_addurl}/ttf-kacst_2.01+mry.tar.gz - ${_addurl}/zxing-cpp-1.1.1.tar.gz ${_addurl}/Amiri-0.111.zip ${_addurl}/ReemKufi-0.7.zip ${_addurl}/Scheherazade-2.100.zip + ${_addurl}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz " -checksum="56c97374956d98c8efcd6d58771c0950c8a641ed84fd64db66382884c4c3b451 - 41ca87cf71842696c9e21c6c01eb6ade5018a5e07f7cd8745c694b74ba3a185b - 087e1444294afe5ab49ea37a2c78c055c2a39000e8979017dd6bb2025d2cae79 - 07f51594fcb32fb3373e94304bade1b91b6d8b5551f8e688da777e4f520448ec +checksum="ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685 + a6f67d5a20fe656c909b16c338759c187cf7e5e7f463d33d8d58a8bbe0280323 + 688634eccb802c156496124b394c0ec5e21059a9b6cd0095930f9e76f9eefe9b + b91b0a482fa42d59e1605f39a3917166e7ff76bfa8e9b62d6eef0a9b04b3351c 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 @@ -127,7 +127,7 @@ checksum="56c97374956d98c8efcd6d58771c0950c8a641ed84fd64db66382884c4c3b451 d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2 f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db 27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22 - 26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304 + ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0 @@ -147,7 +147,7 @@ checksum="56c97374956d98c8efcd6d58771c0950c8a641ed84fd64db66382884c4c3b451 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 - abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d + 97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177 c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09 4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a 7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a @@ -164,10 +164,10 @@ checksum="56c97374956d98c8efcd6d58771c0950c8a641ed84fd64db66382884c4c3b451 f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 - e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86 1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166 f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f - 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5" + 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5 + 471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e" skip_extraction=" 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -181,7 +181,7 @@ skip_extraction=" libcmis-0.5.2.tar.xz libstaroffice-0.0.7.tar.xz libzmf-0.0.2.tar.xz - pdfium-4500.tar.bz2 + pdfium-4699.tar.bz2 bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar @@ -201,7 +201,7 @@ skip_extraction=" f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz + skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz 33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip @@ -218,10 +218,10 @@ skip_extraction=" libre-hebrew-1.0.tar.gz alef-1.001.tar.gz ttf-kacst_2.01+mry.tar.gz - zxing-cpp-1.1.1.tar.gz Amiri-0.111.zip ReemKufi-0.7.zip Scheherazade-2.100.zip + libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz " replaces="libreoffice-firebird<6.2.4.2_1" @@ -436,6 +436,9 @@ post_patch() { do_configure() { local opts + # the build system tries to call curl or wget, we can catch any invocations here and add them to distfiles + ln -s /usr/bin/true ${XBPS_WRAPPERDIR}/curl + # Separate autogen.sh and configure because we need # to patch configure for musl support NOCONFIGURE=1 ./autogen.sh @@ -492,15 +495,15 @@ do_configure() { opts+=" --without-java" fi opts+=" --with-tls=nss" + opts+=" --without-system-abseil" opts+=" --without-system-box2d" opts+=" --without-system-libcmis" opts+=" --without-system-libzmf" opts+=" --without-system-libstaroffice" opts+=" --without-system-libtommath" opts+=" --without-system-jfreereport" - opts+=" --without-system-apache-commons" opts+=" --without-system-beanshell" - opts+=" --without-system-zxing" + opts+=" --without-system-cuckoo" # opts+=" --without-system-glm" opts+=" --with-myspell-dicts" opts+=" --with-system-icu-for-build=yes"