Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libreoffice: update to 7.2.3.2.
@ 2021-11-27 18:03 ericonr
  2021-11-30  4:34 ` sgn
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: ericonr @ 2021-11-27 18:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1797 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages lo
https://github.com/void-linux/void-packages/pull/34272

libreoffice: update to 7.2.3.2.
- remove VLC entirely (deprecated by upstream)
- update vendored tarballs
- add zxing and cmis tarballs (zxing isn't packaged by void, cmis
  upstream doesn't make releases with the necessary changes, see [1])
- builds were erroring out if the translation, dictionaries and help
  tarballs weren't unpacked, so remove them from the skip_extraction
  list, but still symlink them into the external dir so the build system
  doesn't try to download them

[1] https://github.com/tdf/libcmis/issues/42

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **very briefly**

@q66 I've removed the ppc workaround for perms in soffice, please test if the issue still happens.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/34272.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lo-34272.patch --]
[-- Type: text/x-diff, Size: 14604 bytes --]

From 79d42c3fc26fd2457133b311797cb760e05169e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 27 Nov 2021 14:57:04 -0300
Subject: [PATCH] libreoffice: update to 7.2.3.2.

- remove VLC entirely (deprecated by upstream)
- update vendored tarballs
- add zxing and cmis tarballs (zxing isn't packaged by void, cmis
  upstream doesn't make releases with the necessary changes, see [1])
- builds were erroring out if the translation, dictionaries and help
  tarballs weren't unpacked, so remove them from the skip_extraction
  list, but still symlink them into the external dir so the build system
  doesn't try to download them

[1] https://github.com/tdf/libcmis/issues/42
---
 .../libreoffice/patches/fix-vlc-backend.patch | 20 -----
 srcpkgs/libreoffice/template                  | 74 ++++++++++---------
 2 files changed, 38 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/libreoffice/patches/fix-vlc-backend.patch

diff --git a/srcpkgs/libreoffice/patches/fix-vlc-backend.patch b/srcpkgs/libreoffice/patches/fix-vlc-backend.patch
deleted file mode 100644
index 2c121c8ad2c6..000000000000
--- a/srcpkgs/libreoffice/patches/fix-vlc-backend.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- vcl: fix build with vlc backend enabled
- 
- avmedia/source/vlc/vlcplayer.cxx tries to access the aWindow member
- directly, which leads to a compilation failure, since it's private.
-
-diff --git include/vcl/sysdata.hxx include/vcl/sysdata.hxx
-index 63b7c810de3d..0cd0e037c823 100644
---- a/include/vcl/sysdata.hxx
-+++ b/include/vcl/sysdata.hxx
-@@ -73,9 +73,8 @@ struct VCL_DLLPUBLIC SystemEnvData
-     // however, the GTK3 vclplug wants to store pointers in here!
-     sal_IntPtr          aShellWindow;   // the window of the frame's shell
-     Platform            platform;       // the windowing system in use
--private:
--    sal_uIntPtr         aWindow;        // the window of the object
- public:
-+    sal_uIntPtr         aWindow;        // the window of the object
- 
-     void SetWindowHandle(sal_uIntPtr nWindow)
-     {
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6ea455c5c0cb..b3fbf3b7706a 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=7.1.3.2
-revision=4
+version=7.2.3.2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
@@ -12,14 +12,14 @@ hostmakedepends="automake flex git gperf hyphen icu libtool openldap which gette
 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
- libatomic_ops-devel libbluetooth-devel libcdr-devel libcmis-devel libe-book-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
  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 vlc-devel libcppunit-devel
+ telepathy-glib-devel unixodbc-devel vigra-devel libcppunit-devel
  qrcodegen-devel xmlsec1-devel poppler-cpp-devel libxml2-devel"
 depends="libreoffice-common>=${version}_${revision}"
 depends+=" libreoffice-base>=${version}_${revision}"
@@ -59,18 +59,20 @@ distfiles="
  ${_baseurl}/${pkgname}-translations-${version}.tar.xz
  ${_addurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
  ${_addurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- ${_addurl}/language-subtag-registry-2019-04-03.tar.bz2
+ ${_addurl}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${_addurl}/language-subtag-registry-2021-03-05.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}/libcmis-0.5.2.tar.xz
  ${_addurl}/libstaroffice-0.0.7.tar.xz
  ${_addurl}/libzmf-0.0.2.tar.xz
- ${_addurl}/pdfium-4306.tar.bz2
+ ${_addurl}/pdfium-4500.tar.bz2
  ${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
  ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
- ${_exturl}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.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
@@ -87,45 +89,48 @@ 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-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
+ ${_addurl}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
  ${_addurl}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  ${_addurl}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
  ${_addurl}/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
  ${_addurl}/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
  ${_addurl}/liberation-narrow-fonts-ttf-1.07.6.tar.gz
- ${_addurl}/liberation-fonts-ttf-2.00.4.tar.gz
+ ${_addurl}/liberation-fonts-ttf-2.1.4.tar.gz
  ${_addurl}/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
  ${_addurl}/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
  ${_addurl}/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
  ${_addurl}/source-serif-pro-3.000R.tar.gz
  ${_addurl}/EmojiOneColor-SVGinOT-1.3.tar.gz
  ${_addurl}/noto-fonts-20171024.tar.gz
- ${_addurl}/culmus-0.131.tar.gz
+ ${_addurl}/culmus-0.133.tar.gz
  ${_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
 "
-checksum="35af7fd104b253704f770a205f835aee0e82ccc889ebf0949a89d9b3276229bf
- 66dc5fd4253f6b956b8fdde0d741ef7d85f12647db235642eb74f3d0a44d404e
- e0f14b4db1585506761ad2ceeb43850cb594f2ec8a20fc9ca7bcb95e77408935
- 86138935d274d46d27e4ce92a72d759e7d4491d7b227be952e05735ba5c9b327
+checksum="56c97374956d98c8efcd6d58771c0950c8a641ed84fd64db66382884c4c3b451
+ 41ca87cf71842696c9e21c6c01eb6ade5018a5e07f7cd8745c694b74ba3a185b
+ 087e1444294afe5ab49ea37a2c78c055c2a39000e8979017dd6bb2025d2cae79
+ 07f51594fcb32fb3373e94304bade1b91b6d8b5551f8e688da777e4f520448ec
  1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
- a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d
+ 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
+ ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a
  d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
  1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
  233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
  48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
  58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c
+ d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
  f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
  27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
- eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8
+ 26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304
  d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
  f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
- 984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
+ d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
  eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
  49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
  0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
@@ -142,44 +147,44 @@ checksum="35af7fd104b253704f770a205f835aee0e82ccc889ebf0949a89d9b3276229bf
  05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
  a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
  085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
- f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301
+ abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d
  c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
  4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
  7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a
  2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc
  8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3
- c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45
+ 26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef
  54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5
  09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f
  e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61
  826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3
  d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
  29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
- dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b
+ c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
  f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
  b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
  dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
+ e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86
  1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
  f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f
  251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"
 skip_extraction="
- ${pkgname}-dictionaries-${version}.tar.xz
- ${pkgname}-help-${version}.tar.xz
- ${pkgname}-translations-${version}.tar.xz
  798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
  a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- language-subtag-registry-2019-04-03.tar.bz2
+ ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ language-subtag-registry-2021-03-05.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
+ libcmis-0.5.2.tar.xz
  libstaroffice-0.0.7.tar.xz
  libzmf-0.0.2.tar.xz
- pdfium-4306.tar.bz2
+ pdfium-4500.tar.bz2
  bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
  8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
- odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.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
@@ -196,23 +201,24 @@ skip_extraction="
  f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
  7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
+ skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
  368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
  33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
  1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
  liberation-narrow-fonts-ttf-1.07.6.tar.gz
- liberation-fonts-ttf-2.00.4.tar.gz
+ liberation-fonts-ttf-2.1.4.tar.gz
  e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
  907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
  edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
  source-serif-pro-3.000R.tar.gz
  EmojiOneColor-SVGinOT-1.3.tar.gz
  noto-fonts-20171024.tar.gz
- culmus-0.131.tar.gz
+ culmus-0.133.tar.gz
  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
@@ -394,7 +400,7 @@ _add_lang zu		"Zulu"
 post_fetch() {
 	local srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version} pkg
 	mkdir -p ${wrksrc}/external/tarballs
-	for pkg in ${skip_extraction}; do
+	for pkg in ${skip_extraction} libreoffice-{dictionaries,help,translations}-${version}.tar.xz ; do
 		if [ "${pkg%.dll}" != "${pkg}" ]; then
 			# The dll needs to be copied instead of symlinked
 			cp -v ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/
@@ -454,7 +460,6 @@ do_configure() {
 	opts+=" --enable-gtk3"
 	opts+=" --enable-qt5"
 	opts+=" --enable-kf5"
-	opts+=" --enable-vlc"
 	opts+=" --disable-dependency-tracking"
 	opts+=" --enable-release-build"
 	opts+=" --enable-split-app-modules"
@@ -488,12 +493,14 @@ do_configure() {
 	fi
 	opts+=" --with-tls=nss"
 	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-glm"
 	opts+=" --with-myspell-dicts"
 	opts+=" --with-system-icu-for-build=yes"
@@ -515,11 +522,6 @@ do_configure() {
 do_build() {
 	make ${makejobs} ${make_build_target}
 	make ${makejobs} -C libreofficekit
-
-	# on some platforms (32-bit ppc at least), this single file has
-	# incorrect (non-executable) permissions, so fix it here
-	# only this file is affected and i have no idea why...
-	chmod 755 ${wrksrc}/instdir/program/soffice
 }
 
 do_install() {

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-12-03 18:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-27 18:03 [PR PATCH] libreoffice: update to 7.2.3.2 ericonr
2021-11-30  4:34 ` sgn
2021-11-30  4:34 ` sgn
2021-12-01 20:07 ` [PR PATCH] [Updated] " ericonr
2021-12-03 18:46 ` ericonr
2021-12-03 18:46 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).