diff options
author | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2023-08-09 12:50:06 +0000 |
---|---|---|
committer | Đoàn Trần Công Danh <sgn.danh@gmail.com> | 2023-08-30 06:24:12 +0000 |
commit | bd6ba852276853d9f2c88f39140143cbd172b1f3 (patch) | |
tree | 1d231145f4d8a0200d08cc9f2501f77a05fc0cd9 | |
parent | 6c04e6d45ce66febdb67aecf3333f22fb3c1eaf9 (diff) | |
download | void-packages-bd6ba852276853d9f2c88f39140143cbd172b1f3.tar void-packages-bd6ba852276853d9f2c88f39140143cbd172b1f3.tar.gz void-packages-bd6ba852276853d9f2c88f39140143cbd172b1f3.tar.bz2 void-packages-bd6ba852276853d9f2c88f39140143cbd172b1f3.tar.lz void-packages-bd6ba852276853d9f2c88f39140143cbd172b1f3.tar.xz void-packages-bd6ba852276853d9f2c88f39140143cbd172b1f3.tar.zst void-packages-bd6ba852276853d9f2c88f39140143cbd172b1f3.zip |
libreoffice: update to 7.6.0.3.
l--------- | srcpkgs/libreoffice-epub | 1 | ||||
-rw-r--r-- | srcpkgs/libreoffice/files/skia-no-execinfo.patch | 25 | ||||
-rw-r--r-- | srcpkgs/libreoffice/patches/build-option-java.patch | 19 | ||||
-rw-r--r-- | srcpkgs/libreoffice/patches/musl-java.patch | 16 | ||||
-rw-r--r-- | srcpkgs/libreoffice/patches/musl-no-execinfo.patch | 10 | ||||
-rw-r--r-- | srcpkgs/libreoffice/template | 52 |
6 files changed, 44 insertions, 79 deletions
diff --git a/srcpkgs/libreoffice-epub b/srcpkgs/libreoffice-epub deleted file mode 120000 index d5e3a56f350..00000000000 --- a/srcpkgs/libreoffice-epub +++ /dev/null @@ -1 +0,0 @@ -libreoffice
\ No newline at end of file diff --git a/srcpkgs/libreoffice/files/skia-no-execinfo.patch b/srcpkgs/libreoffice/files/skia-no-execinfo.patch deleted file mode 100644 index 4495e8ab060..00000000000 --- a/srcpkgs/libreoffice/files/skia-no-execinfo.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/tools/gpu/vk/VkTestUtils.cpp -+++ b/tools/gpu/vk/VkTestUtils.cpp -@@ -26,7 +26,9 @@ - #include <algorithm> - - #if defined(SK_BUILD_FOR_UNIX) --#include <execinfo.h> -+ #if !defined(__linux__) || defined(__GLIBC__) -+ #include <execinfo.h> -+ #endif - #endif - #include "include/gpu/vk/GrVkBackendContext.h" - #include "include/gpu/vk/GrVkExtensions.h" -@@ -104,9 +106,11 @@ static int should_include_debug_layer(co - - static void print_backtrace() { - #if defined(SK_BUILD_FOR_UNIX) -+ #if !defined(__linux__) || defined(__GLIBC__) - void* stack[64]; - int count = backtrace(stack, SK_ARRAY_COUNT(stack)); - backtrace_symbols_fd(stack, count, 2); -+ #endif - #else - // Please add implementations for other platforms. - #endif diff --git a/srcpkgs/libreoffice/patches/build-option-java.patch b/srcpkgs/libreoffice/patches/build-option-java.patch new file mode 100644 index 00000000000..217d54c12fa --- /dev/null +++ b/srcpkgs/libreoffice/patches/build-option-java.patch @@ -0,0 +1,19 @@ +diff -Naur libreoffice-7.6.0.3.orig/cui/source/options/optjava.cxx libreoffice-7.6.0.3/cui/source/options/optjava.cxx +--- libreoffice-7.6.0.3.orig/cui/source/options/optjava.cxx 2023-08-08 15:49:18.000000000 -0400 ++++ libreoffice-7.6.0.3/cui/source/options/optjava.cxx 2023-08-21 12:38:20.652657824 -0400 +@@ -937,6 +937,7 @@ + + void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath ) + { ++#if HAVE_FEATURE_JAVA + if ( m_sOldPath.isEmpty() ) + m_sOldPath = _rPath; + m_xPathList->clear(); +@@ -962,6 +963,7 @@ + m_xPathList->select(0); + } + SelectHdl_Impl(*m_xPathList); ++#endif + } + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/srcpkgs/libreoffice/patches/musl-java.patch b/srcpkgs/libreoffice/patches/musl-java.patch index f5205f3cb48..a5c62c296ff 100644 --- a/srcpkgs/libreoffice/patches/musl-java.patch +++ b/srcpkgs/libreoffice/patches/musl-java.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -8910,7 +8910,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN +@@ -8909,7 +8909,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; @@ -9,18 +9,18 @@ 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" -@@ -14646,7 +14646,7 @@ else +@@ -14744,7 +14744,7 @@ else case "$host_os" in -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) +- dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) ++ dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) if test "$ENABLE_JAVA" != ""; then pathmunge "$JAVA_HOME/bin" "after" fi --- a/configure +++ b/configure -@@ -22754,7 +22754,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN +@@ -22737,7 +22737,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; @@ -29,12 +29,12 @@ 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" -@@ -46454,7 +46454,7 @@ else +@@ -46802,7 +46802,7 @@ else case "$host_os" in -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) +- dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) ++ dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) if test "$ENABLE_JAVA" != ""; then pathmunge "$JAVA_HOME/bin" "after" fi diff --git a/srcpkgs/libreoffice/patches/musl-no-execinfo.patch b/srcpkgs/libreoffice/patches/musl-no-execinfo.patch deleted file mode 100644 index a430c5d1536..00000000000 --- a/srcpkgs/libreoffice/patches/musl-no-execinfo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/external/skia/UnpackedTarball_skia.mk -+++ b/external/skia/UnpackedTarball_skia.mk -@@ -41,6 +41,7 @@ skia_patches := \ - constexpr-template.patch.0 \ - missing-include.patch.0 \ - tdf147342.patch.0 \ -+ skia-no-execinfo.patch.1 \ - - $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) - diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index a5ade73cc19..6dbe8c87309 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,18 +1,18 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=7.5.5.2 -revision=2 +version=7.6.0.3 +revision=1 build_style=meta make_build_target="build" hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz perl-Archive-Zip pkg-config qt5-qmake sane unzip zip python3-setuptools - fontforge python3-lxml qt6-base-devel gtk4-devel gobject-introspection gnupg" + fontforge python3-lxml qt6-base 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+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 boost-devel zlib-devel bzip2-devel libxslt-devel + libfreehand-devel boost-devel zlib-devel bzip2-devel libxslt-devel frozen 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 @@ -90,13 +90,14 @@ distfiles=" ${_addurl}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip ${_addurl}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_addurl}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz + ${_addurl}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz + ${_addurl}/frozen-1.1.1.tar.gz ${_addurl}/dragonbox-1.1.3.tar.gz " -checksum="6628dfd2a21041a7c5bb6d72733e0fd52efa7959c95084fcd4d96cc4a61b0561 - 33c023d3e5abe5649350ae1242fcd5d6c069066f283db967b6aab35aa4857504 - 1de834979bf25c3c6f368362dd20c95d0bee514a42eee903a32188d40488aa62 - 24b5c791a17128361b5f3c8538348002a714d0ba2aab37e3bf10e16b7ac049b7 +checksum="07f33f11a75b72a3044749d4f2f7d02a0fd79eaed4fb73e618ec5fe3576d0c25 + b932cdd6bd2ee717f3a09766c88fe90100b0c2c0509313c3ee297f95c084ee2e + 210f18ff60e93d366856d84e714d3fd6f184f399b5163afc92b7e11155cbe768 + 667e4ffeacc01bd0f830c2edcc56e2328f924eeac224639babeb3841a44ec5f4 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 @@ -123,7 +124,8 @@ checksum="6628dfd2a21041a7c5bb6d72733e0fd52efa7959c95084fcd4d96cc4a61b0561 abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 - c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9 + 0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9 + f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384" skip_extraction=" 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -152,7 +154,8 @@ skip_extraction=" 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz + skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz + frozen-1.1.1.tar.gz dragonbox-1.1.3.tar.gz " replaces="libreoffice-firebird<6.2.4.2_1" @@ -488,8 +491,9 @@ do_install() { libreoffice-common_package() { short_desc+=" - Common files" - depends="hunspell hyphen mythes openldap libreoffice-i18n-en-US>=${version}_${revision}" + depends="libreoffice-i18n-en-US>=${version}_${revision}" skiprdeps=/usr/lib/libreoffice/program/libofficebean.so + replaces="libreoffice-epub>=0" pkg_install() { _split common } @@ -498,7 +502,6 @@ libreoffice-common_package() { libreoffice-base_package() { short_desc+=" - Database frontend" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split base } @@ -507,7 +510,6 @@ libreoffice-base_package() { libreoffice-calc_package() { short_desc+=" - Spreadsheet" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split calc } @@ -516,7 +518,6 @@ libreoffice-calc_package() { libreoffice-draw_package() { short_desc+=" - Drawing application" depends="sane libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split draw } @@ -556,8 +557,6 @@ libreoffice-fonts_package() { libreoffice-gnome_package() { short_desc+=" - GNOME integration" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split gnome } @@ -566,7 +565,6 @@ libreoffice-gnome_package() { libreoffice-impress_package() { short_desc+=" - Presentation application" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split impress } @@ -574,8 +572,6 @@ libreoffice-impress_package() { libreoffice-kde_package() { short_desc+=" - KDE integration" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { cat > ${wrksrc}/file-lists/kde5_list.txt <<-EOF %dir /usr/lib/libreoffice/program @@ -593,8 +589,6 @@ libreoffice-kde_package() { 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 @@ -615,7 +609,6 @@ libreoffice-kit_package() { libreoffice-math_package() { short_desc+=" - Equation editor" depends="libreoffice-writer>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split math } @@ -623,8 +616,7 @@ libreoffice-math_package() { libreoffice-postgresql_package() { short_desc+=" - Connector for PostgreSQL" - depends="libreoffice-base>=${version}_${revision} libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes + depends="libreoffice-base>=${version}_${revision}" pkg_install() { _split postgresql } @@ -632,25 +624,15 @@ libreoffice-postgresql_package() { libreoffice-writer_package() { short_desc+=" - Word processor" - depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { _split writer } } -libreoffice-epub_package() { - short_desc+=" - EPUB output" - build_style=meta - depends="libreoffice-common>=${version}_${revision} libepubgen libabw libe-book - libetonyek libwps" -} - # Use a name which makes this catch-all subpackage the last one libreoffice-xtensions_package() { short_desc+=" - Extensions" depends="libreoffice-common>=${version}_${revision}" - noverifyrdeps=yes pkg_install() { # Remove empty files find ${DESTDIR}/all -size 0 -delete |