extra/libreoffice-still to 7.2.7-1

This commit is contained in:
David Beauchamp 2022-05-12 18:00:42 -04:00
parent b5a50d6b81
commit 48b0e333c1
2 changed files with 19 additions and 19 deletions

View file

@ -17,9 +17,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
pkgbase=libreoffice-still
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
_LOver=7.2.6.2
pkgver=7.2.6
pkgrel=3
_LOver=7.2.7.2
pkgver=7.2.7
pkgrel=1
arch=('x86_64')
license=('LGPL3')
url="https://www.libreoffice.org/"
@ -92,11 +92,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
185d60944ea767075d27247c3162b3bc-unowinreg.dll
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
sha256sums=('483765a98b92d90e8c8c735e08d33c2a34b5fe1fbc8e7f6b1f9c74ad1a141e31'
sha256sums=('6deaf83a0c2b83c5c8c53c2a9443e2ece51e19469494be2027d4fef3a61bc6a2'
'SKIP'
'4e3020cfbc95ef2e5536b12e4f678496434667387a279f13d530b7bb6029da8e'
'a4d87b16c05e892b741db9683474692c25907f8df162d5c27ba65bdc8fcb6fe2'
'SKIP'
'7d465f966ac28b898e6ba8994e6f8af48bd14e54a3708e14278128c8afc71dc9'
'2377014eea11b41e998545aae875ee32df097e869ea329f1be07a44c28595d04'
'SKIP'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@ -120,7 +120,7 @@ sha256sums=('483765a98b92d90e8c8c735e08d33c2a34b5fe1fbc8e7f6b1f9c74ad1a141e31'
'e61e2a266c7a4374377475254a2f095c1ce2376980b301955a4e5a0d32d3c25b'
'caaef7919c6296ab93c7d02607503f91ec965387d038779c0aba9fce78b8e456'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'fd73edaa09a48e2b2c4f4f32af68f1ef01cc181d49a5dfc1f65a5ad4883d7db8'
'fd84c4920b25a6ec4f5f08c852ae10a63a3d19c07d83916964f7fa23597d33dd'
'81a8551aaea0ab1750d36fb8bfbd04340a43eaab349a43c1384d21ef6504ab47'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'

View file

@ -265,7 +265,7 @@ diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/U
index 710d126a8c17..3d2cec42e55e 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -20,12 +20,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
@@ -29,12 +29,11 @@
external/liborcus/gcc9.patch.0 \
external/liborcus/libtool.patch.0 \
external/liborcus/fix-pch.patch.0 \
@ -279,9 +279,9 @@ index 710d126a8c17..3d2cec42e55e 100644
+ external/liborcus/unused-variables.patch.1 \
+ external/liborcus/boost-filesystem.patch.1 \
+ external/liborcus/std-get-busted.patch.1 \
))
ifeq ($(OS),WNT)
external/liborcus/forcepoint-83.patch.1 \
external/liborcus/forcepoint-84.patch.1 \
external/liborcus/forcepoint-87.patch.1 \
diff --git a/external/liborcus/allow-utf-8-in-xml-names.patch b/external/liborcus/allow-utf-8-in-xml-names.patch
deleted file mode 100644
index e3430881053d..000000000000
@ -3505,14 +3505,14 @@ index 3d2cec42e55e..86c30431e05d 100644
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
@@ -25,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
@@ -37,6 +37,7 @@
external/liborcus/unused-variables.patch.1 \
external/liborcus/boost-filesystem.patch.1 \
external/liborcus/std-get-busted.patch.1 \
+ external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1 \
))
ifeq ($(OS),WNT)
external/liborcus/forcepoint-83.patch.1 \
external/liborcus/forcepoint-84.patch.1 \
external/liborcus/forcepoint-87.patch.1 \
diff --git a/external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1 b/external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1
new file mode 100644
index 000000000000..97e7b8366fde
@ -3615,7 +3615,7 @@ diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/U
index 86c30431e05d..87e462e33d91 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -24,11 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
@@ -33,11 +33,7 @@
external/liborcus/libtool.patch.0 \
external/liborcus/fix-pch.patch.0 \
external/liborcus/liborcus_newline.patch.1 \
@ -3624,9 +3624,9 @@ index 86c30431e05d..87e462e33d91 100644
- external/liborcus/boost-filesystem.patch.1 \
external/liborcus/std-get-busted.patch.1 \
- external/liborcus/crashtesting-crash-on-passing-null-to-std-string_vie.patch.1 \
))
ifeq ($(OS),WNT)
external/liborcus/forcepoint-83.patch.1 \
external/liborcus/forcepoint-84.patch.1 \
external/liborcus/forcepoint-87.patch.1 \
diff --git a/external/liborcus/boost-filesystem.patch.1 b/external/liborcus/boost-filesystem.patch.1
deleted file mode 100644
index 14128b4e1c67..000000000000