libreoffice: update to 7.4.2.3.
This commit is contained in:
Đoàn Trần Công Danh
Đoàn Trần Công Danh
parent
7fbcaf9afd
commit
43bf45d65d
5 changed files with 77 additions and 213 deletions
1
srcpkgs/libreoffice-qt6
Symbolic link
1
srcpkgs/libreoffice-qt6
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
libreoffice
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From f7e170eb084cd4e92818de966b287330184749a8 Mon Sep 17 00:00:00 2001
|
||||
From: Rene Engelhard <rene@debian.org>
|
||||
Date: Wed, 24 Aug 2022 09:55:33 +0200
|
||||
Subject: [PATCH] Make configure work with gpgme >= 1.18
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Sam James wrote:
|
||||
> gpgme-1.18.0 dropped a bunch of internal symbols,
|
||||
> including progress_callback (see e.g. callbacks.h
|
||||
> which has a comment at the top saying it's internal).
|
||||
|
||||
Plausibly the workaround to not link against older KDE-specific distro
|
||||
packages is not needed anymore.
|
||||
|
||||
Check for main as a workaround as we do for other C++ libraries, too.
|
||||
|
||||
Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667
|
||||
Tested-by: Jenkins
|
||||
Reviewed-by: Sam James <sam@gentoo.org>
|
||||
Reviewed-by: René Engelhard <rene@debian.org>
|
||||
---
|
||||
configure.ac | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 24cb01aa0db02..61806988b94b7 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -12539,12 +12539,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE
|
||||
# C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
|
||||
AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
|
||||
[AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], [])
|
||||
- # progress_callback is the only func with plain C linkage
|
||||
- # checking for it also filters out older, KDE-dependent libgpgmepp versions
|
||||
- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ],
|
||||
- [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
|
||||
AC_CHECK_HEADER(gpgme.h, [],
|
||||
[AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
|
||||
+ AC_CHECK_LIB(gpgmepp, main, [],
|
||||
+ [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
|
||||
+ GPGMEPP_LIBS=-lgpgmepp
|
||||
else
|
||||
AC_MSG_RESULT([internal])
|
||||
BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
||||
index ad6320139..e5f6d9c68 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
||||
@@ -138,6 +138,15 @@ int main(int argc, char **argv)
|
||||
_setmode( _fileno( g_binary_out ), _O_BINARY );
|
||||
#endif
|
||||
|
||||
+#if POPPLER_CHECK_VERSION(22, 3, 0)
|
||||
+ PDFDoc aDoc( std::make_unique<GooString>(pFileName),
|
||||
+ GooString(pOwnerPasswordStr),
|
||||
+ GooString(pUserPasswordStr) );
|
||||
+
|
||||
+ PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName),
|
||||
+ GooString(pOwnerPasswordStr),
|
||||
+ GooString(pUserPasswordStr) );
|
||||
+#else
|
||||
PDFDoc aDoc( pFileName,
|
||||
pOwnerPasswordStr,
|
||||
pUserPasswordStr );
|
||||
@@ -145,6 +154,7 @@ int main(int argc, char **argv)
|
||||
PDFDoc aErrDoc( pErrFileName,
|
||||
pOwnerPasswordStr,
|
||||
pUserPasswordStr );
|
||||
+#endif
|
||||
|
||||
// Check various permissions for aDoc.
|
||||
PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc;
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
# Patch from FreeBSD (https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd)
|
||||
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -474,11 +474,17 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* g
|
||||
{
|
||||
// TODO(P3): Unfortunately, need to read stream twice, since
|
||||
// we must write byte count to stdout before
|
||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
||||
char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
|
||||
+#else
|
||||
+ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
|
||||
+#endif
|
||||
if( pBuf )
|
||||
{
|
||||
aNewFont.isEmbedded = true;
|
||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
||||
gfree(pBuf);
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -492,21 +498,32 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) cons
|
||||
return;
|
||||
|
||||
int nSize = 0;
|
||||
- char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
|
||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
||||
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
|
||||
+#else
|
||||
+ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
|
||||
+#endif
|
||||
if( !pBuf )
|
||||
return;
|
||||
|
||||
// ---sync point--- see SYNC STREAMS above
|
||||
fflush(stdout);
|
||||
-
|
||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
||||
if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
|
||||
+#else
|
||||
+ if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
|
||||
+#endif
|
||||
{
|
||||
- gfree(pBuf);
|
||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
||||
+ gfree(pBuf);
|
||||
+#endif
|
||||
exit(1); // error
|
||||
}
|
||||
// ---sync point--- see SYNC STREAMS above
|
||||
fflush(g_binary_out);
|
||||
- gfree(pBuf);
|
||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
||||
+ gfree(pBuf);
|
||||
+#endif
|
||||
}
|
||||
|
||||
#if POPPLER_CHECK_VERSION(0, 83, 0)
|
||||
@@ -759,7 +776,11 @@ void PDFOutDev::updateFont(GfxState *state)
|
||||
{
|
||||
assert(state);
|
||||
|
||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
||||
GfxFont *gfxFont = state->getFont();
|
||||
+#else
|
||||
+ GfxFont *gfxFont = state->getFont().get();
|
||||
+#endif
|
||||
if( !gfxFont )
|
||||
return;
|
||||
|
||||
|
|
@ -1,25 +1,27 @@
|
|||
# Template file for 'libreoffice'
|
||||
pkgname=libreoffice
|
||||
version=7.3.3.2
|
||||
revision=4
|
||||
version=7.4.2.3
|
||||
revision=1
|
||||
build_style=meta
|
||||
make_build_target="build-nocheck"
|
||||
make_build_target="build"
|
||||
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 zip python3-setuptools
|
||||
fontforge python3-lxml"
|
||||
fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg"
|
||||
makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
|
||||
frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
|
||||
gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel
|
||||
gtk+3-devel gtk4-devel hunspell-devel hyphen-devel libXt-devel libabw-devel glm
|
||||
libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel
|
||||
libepubgen-devel libetonyek-devel libexttextcat-devel libfbclient3-devel libfreehand-devel
|
||||
libepubgen-devel libetonyek-devel libexttextcat-devel libfbclient3-devel
|
||||
libfreehand-devel boost-devel bzip2-devel libxslt-devel
|
||||
libgcrypt-devel libgltf-devel libldap-devel libmariadbclient-devel libmspub-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
|
||||
qt6-base-devel libwebp-devel libgirepository-devel
|
||||
qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel zxing-cpp-devel"
|
||||
depends="libreoffice-common>=${version}_${revision}"
|
||||
depends+=" libreoffice-base>=${version}_${revision}"
|
||||
|
|
@ -60,25 +62,20 @@ distfiles="
|
|||
${_addurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
${_addurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
${_addurl}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
|
||||
${_addurl}/language-subtag-registry-2021-03-05.tar.bz2
|
||||
${_addurl}/language-subtag-registry-2022-08-08.tar.bz2
|
||||
${_addurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
|
||||
${_addurl}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
|
||||
${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
|
||||
${_addurl}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
|
||||
${_addurl}/box2d-2.3.1.tar.gz
|
||||
${_addurl}/box2d-2.4.1.tar.gz
|
||||
${_addurl}/libcmis-0.5.2.tar.xz
|
||||
${_addurl}/libstaroffice-0.0.7.tar.xz
|
||||
${_addurl}/libzmf-0.0.2.tar.xz
|
||||
${_addurl}/pdfium-4699.tar.bz2
|
||||
${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
|
||||
${_addurl}/pdfium-5058.tar.bz2
|
||||
${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
|
||||
${_exturl}/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
|
||||
${_exturl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
${_addurl}/commons-logging-1.2-src.tar.gz
|
||||
${_addurl}/dtoa-20180411.tgz
|
||||
${_addurl}/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
|
||||
${_addurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
${_addurl}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
|
||||
${_addurl}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
|
||||
${_addurl}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
|
||||
${_addurl}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
|
||||
|
|
@ -87,9 +84,8 @@ distfiles="
|
|||
${_addurl}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
|
||||
${_addurl}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
|
||||
${_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-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
|
||||
${_addurl}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
|
||||
${_addurl}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
|
||||
${_addurl}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
|
||||
${_addurl}/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
|
||||
|
|
@ -106,37 +102,32 @@ distfiles="
|
|||
${_addurl}/libre-hebrew-1.0.tar.gz
|
||||
${_addurl}/alef-1.001.tar.gz
|
||||
${_addurl}/ttf-kacst_2.01+mry.tar.gz
|
||||
${_addurl}/Amiri-0.111.zip
|
||||
${_addurl}/ReemKufi-0.7.zip
|
||||
${_addurl}/Amiri-0.117.zip
|
||||
${_addurl}/ReemKufi-1.2.zip
|
||||
${_addurl}/Scheherazade-2.100.zip
|
||||
${_addurl}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
|
||||
${_addurl}/dragonbox-1.1.0.tar.gz
|
||||
"
|
||||
checksum="ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685
|
||||
a6f67d5a20fe656c909b16c338759c187cf7e5e7f463d33d8d58a8bbe0280323
|
||||
688634eccb802c156496124b394c0ec5e21059a9b6cd0095930f9e76f9eefe9b
|
||||
b91b0a482fa42d59e1605f39a3917166e7ff76bfa8e9b62d6eef0a9b04b3351c
|
||||
checksum="82c1ffe02f2ed8ee1451a9f67c35335b27a638db591f9bc539eff86ab14dd95a
|
||||
46a7fb02a6b06bbc8c6f0e8e6c286fbdb88404d68fad0635bdd008688ba93ed7
|
||||
4f9ed5dd9d8b394be442ddb86f57cb78746282d886e0dc35add36e8b34170f5c
|
||||
c8053f863c95c31a83a079bb2eefd9b666ffd59e40c4344098c04a924a54f6e1
|
||||
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
|
||||
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
|
||||
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
|
||||
ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a
|
||||
e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00
|
||||
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
|
||||
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
|
||||
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
|
||||
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
|
||||
58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c
|
||||
d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2
|
||||
d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
|
||||
f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
|
||||
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
|
||||
ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf
|
||||
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
|
||||
eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac
|
||||
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
|
||||
d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
|
||||
eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
|
||||
49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
|
||||
0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
|
||||
9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96
|
||||
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
|
||||
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
|
||||
1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
|
||||
75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
|
||||
e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
|
||||
|
|
@ -145,9 +136,8 @@ checksum="ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685
|
|||
3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
|
||||
abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
|
||||
05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
|
||||
a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
|
||||
085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
|
||||
97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177
|
||||
c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9
|
||||
c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
|
||||
4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
|
||||
7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a
|
||||
|
|
@ -164,33 +154,29 @@ checksum="ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685
|
|||
f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
|
||||
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
|
||||
dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
|
||||
1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
|
||||
f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f
|
||||
9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7
|
||||
c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413
|
||||
251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5
|
||||
471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e"
|
||||
293247ccba995ec47ae3abb52c3e83904a7d71efb7093d4c0d2c6367c1cc1e20
|
||||
"
|
||||
skip_extraction="
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
|
||||
language-subtag-registry-2021-03-05.tar.bz2
|
||||
language-subtag-registry-2022-08-08.tar.bz2
|
||||
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
|
||||
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
|
||||
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
|
||||
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
|
||||
box2d-2.3.1.tar.gz
|
||||
box2d-2.4.1.tar.gz
|
||||
libcmis-0.5.2.tar.xz
|
||||
libstaroffice-0.0.7.tar.xz
|
||||
libzmf-0.0.2.tar.xz
|
||||
pdfium-4699.tar.bz2
|
||||
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
|
||||
pdfium-5058.tar.bz2
|
||||
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
|
||||
odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
|
||||
185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
commons-logging-1.2-src.tar.gz
|
||||
dtoa-20180411.tgz
|
||||
beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
|
||||
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
|
||||
b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
|
||||
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
|
||||
3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
|
||||
|
|
@ -199,9 +185,8 @@ skip_extraction="
|
|||
97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
|
||||
8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
|
||||
f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
|
||||
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
|
||||
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
|
||||
skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
|
||||
skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
|
||||
368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
|
||||
c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
|
||||
33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
|
||||
|
|
@ -218,20 +203,16 @@ skip_extraction="
|
|||
libre-hebrew-1.0.tar.gz
|
||||
alef-1.001.tar.gz
|
||||
ttf-kacst_2.01+mry.tar.gz
|
||||
Amiri-0.111.zip
|
||||
ReemKufi-0.7.zip
|
||||
Amiri-0.117.zip
|
||||
ReemKufi-1.2.zip
|
||||
Scheherazade-2.100.zip
|
||||
libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
|
||||
dragonbox-1.1.0.tar.gz
|
||||
"
|
||||
replaces="libreoffice-firebird<6.2.4.2_1"
|
||||
|
||||
build_options="java"
|
||||
desc_option_java="Enable Java support"
|
||||
|
||||
if [ "$XBPS_CHECK_PKGS" ]; then
|
||||
make_build_target="build"
|
||||
fi
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) # Broken unit tests
|
||||
CXXFLAGS+=" -DDISABLE_CVE_TESTS=1"
|
||||
|
|
@ -255,20 +236,20 @@ CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1"
|
|||
_split() {
|
||||
local list file dir destdir
|
||||
destdir="${DESTDIR}/all"
|
||||
for list in ${wrksrc}/file-lists/${1}_list.txt; do
|
||||
# skip non-existing file lists
|
||||
! [ -f ${list} ] && msg_error "There is no ${1}_list.txt file!\n"
|
||||
for file in $(grep -v ^%dir ${list} | sort | uniq); do
|
||||
dir="${file%/*}"
|
||||
! [ -d "${PKGDESTDIR}/${dir}" ] && vmkdir "${dir}"
|
||||
mv ${destdir}/${file} ${PKGDESTDIR}/${dir}/
|
||||
done
|
||||
list=${wrksrc}/file-lists/${1}_list.txt
|
||||
# skip non-existing file lists
|
||||
[ -f ${list} ] || msg_error "There is no ${1}_list.txt file!\n"
|
||||
grep -v '^%dir' "$list" | sort -u |
|
||||
while read file; do
|
||||
dir="${file%/*}"
|
||||
[ -d "${PKGDESTDIR}/${dir}" ] || vmkdir "${dir}"
|
||||
mv ${destdir}/${file} ${PKGDESTDIR}/${dir}/
|
||||
done
|
||||
# Move appdata file, if any
|
||||
file=usr/share/appdata/libreoffice-${1}.appdata.xml
|
||||
file=usr/share/metainfo/libreoffice-${1}.appdata.xml
|
||||
if [ -f ${destdir}/${file} ]; then
|
||||
dir="${file%/*}"
|
||||
! [ -d "${PKGDESTDIR}/${dir}" ] && vmkdir "${dir}"
|
||||
[ -d "${PKGDESTDIR}/${dir}" ] || vmkdir "${dir}"
|
||||
mv ${destdir}/${file} ${PKGDESTDIR}/${dir}/
|
||||
fi
|
||||
}
|
||||
|
|
@ -433,7 +414,10 @@ 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
|
||||
ln -sf /bin/true ${XBPS_WRAPPERDIR}/curl
|
||||
ln -sf /bin/true ${XBPS_WRAPPERDIR}/wget
|
||||
|
||||
export QT6DIR=/usr/lib/qt6
|
||||
|
||||
# Separate autogen.sh and configure because we need
|
||||
# to patch configure for musl support
|
||||
|
|
@ -454,8 +438,12 @@ do_configure() {
|
|||
opts+=" --disable-online-update"
|
||||
opts+=" --enable-python=system"
|
||||
opts+=" --enable-gtk3"
|
||||
opts+=" --enable-introspection"
|
||||
opts+=" --enable-gtk4"
|
||||
opts+=" --enable-qt5"
|
||||
opts+=" --enable-qt6"
|
||||
opts+=" --enable-kf5"
|
||||
opts+=" --enable-gtk3-kde5"
|
||||
opts+=" --disable-dependency-tracking"
|
||||
opts+=" --enable-release-build"
|
||||
opts+=" --enable-split-app-modules"
|
||||
|
|
@ -465,7 +453,7 @@ do_configure() {
|
|||
opts+=" --with-system-headers"
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
x86_64) # opts+=" --enable-ext-mariadb-connector"
|
||||
opts+=" --enable-ext-ct2n"
|
||||
# opts+=" --enable-ext-ct2n"
|
||||
opts+=" --enable-ext-numbertext"
|
||||
opts+=" --enable-ext-nlpsolver"
|
||||
# opts+=" --enable-ext-languagetool"
|
||||
|
|
@ -490,16 +478,19 @@ do_configure() {
|
|||
opts+=" --with-tls=nss"
|
||||
opts+=" --without-system-abseil"
|
||||
opts+=" --without-system-box2d"
|
||||
# https://github.com/tdf/libcmis/pull/43 changes ABI
|
||||
opts+=" --without-system-libcmis"
|
||||
opts+=" --without-system-libzmf"
|
||||
opts+=" --without-system-libstaroffice"
|
||||
opts+=" --without-system-libtommath"
|
||||
opts+=" --without-system-jfreereport"
|
||||
opts+=" --without-system-beanshell"
|
||||
opts+=" --without-system-cuckoo"
|
||||
# opts+=" --without-system-cuckoo"
|
||||
# opts+=" --without-system-glm"
|
||||
opts+=" --without-system-dragonbox"
|
||||
opts+=" --without-system-libfixmath"
|
||||
opts+=" --with-myspell-dicts"
|
||||
opts+=" --with-system-icu-for-build=yes"
|
||||
# opts+=" --with-system-icu-for-build=yes"
|
||||
# use system utilities
|
||||
opts+=" --enable-build-opensymbol"
|
||||
opts+=" --with-system-ucpp=yes"
|
||||
|
|
@ -596,14 +587,32 @@ libreoffice-kde_package() {
|
|||
noverifyrdeps=yes
|
||||
pkg_install() {
|
||||
cat > ${wrksrc}/file-lists/kde5_list.txt <<-EOF
|
||||
%dir /usr/lib/libreoffice/program
|
||||
%dir /usr/share/metainfo
|
||||
/usr/lib/libreoffice/program/libkf5be1lo.so
|
||||
/usr/lib/libreoffice/program/libvclplug_gtk3_kde5lo.so
|
||||
/usr/lib/libreoffice/program/libvclplug_kf5lo.so
|
||||
/usr/lib/libreoffice/program/libvclplug_qt5lo.so
|
||||
/usr/lib/libreoffice/program/lo_kde5filepicker
|
||||
/usr/share/metainfo/org.libreoffice.kde.metainfo.xml
|
||||
EOF
|
||||
_split kde5
|
||||
}
|
||||
}
|
||||
|
||||
libreoffice-qt6_package() {
|
||||
short_desc+=" - Qt6 integration"
|
||||
depends="libreoffice-common>=${version}_${revision}"
|
||||
noverifyrdeps=yes
|
||||
pkg_install() {
|
||||
cat > ${wrksrc}/file-lists/qt6_list.txt <<-EOF
|
||||
%dir /usr/lib/libreoffice/program
|
||||
/usr/lib/libreoffice/program/libvclplug_qt6lo.so
|
||||
EOF
|
||||
_split qt6
|
||||
}
|
||||
}
|
||||
|
||||
libreoffice-kit_package() {
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue