Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libreoffice: update to 7.2.3.2. #34272

Merged
merged 1 commit into from
Dec 3, 2021
Merged

libreoffice: update to 7.2.3.2. #34272

merged 1 commit into from
Dec 3, 2021

Conversation

ericonr
Copy link
Member

@ericonr ericonr commented Nov 27, 2021

  • 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] tdf/libcmis#42

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.

[ci skip]

@sgn
Copy link
Member

sgn commented Nov 30, 2021

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6ea455c5c0..076389c007 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -540,7 +540,7 @@ libreoffice-common_package() {
 
 libreoffice-base_package() {
 	short_desc+=" - Database frontend"
-	depends="libreoffice-common>=${version}_${revision}"
+	depends="libreoffice-writer>=${version}_${revision}"
 	noverifyrdeps=yes
 	pkg_install() {
 		_split base
@@ -549,7 +549,7 @@ libreoffice-base_package() {
 
 libreoffice-calc_package() {
 	short_desc+=" - Spreadsheet"
-	depends="libreoffice-common>=${version}_${revision}"
+	depends="libreoffice-writer>=${version}_${revision}"
 	noverifyrdeps=yes
 	pkg_install() {
 		_split calc
@@ -558,7 +558,7 @@ libreoffice-calc_package() {
 
 libreoffice-draw_package() {
 	short_desc+=" - Drawing application"
-	depends="sane libreoffice-common>=${version}_${revision}"
+	depends="sane libreoffice-writer>=${version}_${revision}"
 	noverifyrdeps=yes
 	pkg_install() {
 		_split draw
@@ -585,7 +585,7 @@ libreoffice-gnome_package() {
 
 libreoffice-impress_package() {
 	short_desc+=" - Presentation application"
-	depends="libreoffice-common>=${version}_${revision}"
+	depends="libreoffice-writer>=${version}_${revision}"
 	noverifyrdeps=yes
 	pkg_install() {
 		_split impress
@@ -616,7 +616,7 @@ libreoffice-kit_package() {
 
 libreoffice-math_package() {
 	short_desc+=" - Equation editor"
-	depends="libreoffice-common>=${version}_${revision}"
+	depends="libreoffice-writer>=${version}_${revision}"
 	noverifyrdeps=yes
 	pkg_install() {
 		_split math

- 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
- move most subpackages to depend on writer, since it contains some of
  the needed pieces for them. This closes void-linux#34304
- remove outdated permission fix for soffice

[1] tdf/libcmis#42
@ericonr ericonr merged commit 6ab67d6 into void-linux:master Dec 3, 2021
@ericonr ericonr deleted the lo branch December 3, 2021 18:49
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants