libreoffice: 7.2.1.2 -> 7.2.2.1

3 files changed, 6 insertions, 62 deletions

diff --git a/libreoffice/.signature b/libreoffice/.signature
index 28b73b038..710325de5 100644
--- a/libreoffice/.signature
+++ b/libreoffice/.signature
@@ -1,13 +1,12 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3z+LnZBdZIdho0OruC4F+OqAhONu1sPlgODd/8mz1bKMpL8scavPEf8gPJPFnEDS5kce6Dv9wxxzC3nIRtmNqgo=
-SHA256 (Pkgfile) = cafd05b6de236c1582955407ca98f566b50a2479b035b290a7e37a99ee5ff15f
+RWSagIOpLGJF37pAQ/ttUZqfM4Ncd3uh7TxpRSYo5ETArI7TtT9/APEdedWsnXpBIAEvwGnSvPR7CZmJYcAqzvCoHdcIjPDgFgc=
+SHA256 (Pkgfile) = cea34df2a161ac16aa77d7cddab77a53c3e2b165f513f0077ead01b27e6e6d45
 SHA256 (.footprint) = e723234350c195c0f15a287b1bb4343483bde67a3718f3771235dfac9bf380a8
-SHA256 (libreoffice-7.2.1.2.tar.xz) = 7a16b46fb397e72fce2d06b786025f321da12ccc39c9976510674ff9119b0a4d
-SHA256 (libreoffice-dictionaries-7.2.1.2.tar.xz) = 6c8c62785c855f8401db9018897b1a18a13f9fd363af8fc96988b79c82ff727b
+SHA256 (libreoffice-7.2.2.1.tar.xz) = c18f37a9bc90b66773054b054a0996079462c23c2fd60cb87823082420bb127b
+SHA256 (libreoffice-dictionaries-7.2.2.1.tar.xz) = a2483725a60d9dd252540e8ca0e9df535691d470fedc21c164a77bcf577de993
 SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
 SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
 SHA256 (dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
 SHA256 (pdfium-4500.tar.bz2) = 26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304
 SHA256 (makefile.in.patch) = 7d9792f2fa5d1f531efa89859b366627003399a308d3af84799c5ba24bac1e8d
 SHA256 (pdfium-use-system-libopenjpeg.diff) = 3c6a5683769c9367c2a81a64d39b627588d7557f00901098a9f86ec55ca6b6b1
-SHA256 (bison.patch) = cd3edecb1ce84be24b6819b5b12e924040dcff85b80f5af1e5f45877bedef801
diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile
index 45331eb3e..0fbcfca24 100644
--- a/libreoffice/Pkgfile
+++ b/libreoffice/Pkgfile
@@ -5,7 +5,7 @@
 # Optional: cups kio openldap qt5 valgrind
 
 name=libreoffice
-version=7.2.1.2
+version=7.2.2.1
 release=1
 pdfiumversion=4500
 source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-$version.tar.xz
@@ -16,8 +16,7 @@ source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/
   #https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
   https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2
   #https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz
-  makefile.in.patch pdfium-use-system-libopenjpeg.diff
-  bison.patch)
+  makefile.in.patch pdfium-use-system-libopenjpeg.diff)
 
 # unpack_source() {{{
 unpack_source() {
@@ -51,7 +50,6 @@ build() {
   cd $name-$version
 
   patch -Np1 -i $SRC/makefile.in.patch
-  patch -Np1 -i $SRC/bison.patch
 
   # https://sources.debian.org/patches/libreoffice/1:7.1.4%7Erc1-1/pdfium-use-system-libopenjpeg.diff/
   patch -Np1 -i $SRC/pdfium-use-system-libopenjpeg.diff
diff --git a/libreoffice/bison.patch b/libreoffice/bison.patch
deleted file mode 100644
index b60b99a6c..000000000
--- a/libreoffice/bison.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 14 Sep 2021 12:20:48 +0200
-Subject: Adapt to Bison 3.8 internal yyn -> yyrule rename
-
-see
-<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865>
-"glr2.cc: log the execution of deferred actions" including "Rename argument yyn
-as yyrule for clarity."
-
-YYBISON was defined as 1 rather than as a representation of the Bison version
-prior to
-<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09>
-"yacc.c: provide the Bison version as an integral macro", which shouldn't be a
-problem here.  And YYBISON is apparently completely undefined with
-/usr/bin/bison on macOS.
-
-(The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch
-with the actually used "yyn" and "yyr1" ever since
-c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it
-untouched.)
-
-Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
----
- connectivity/source/parse/sqlbison.y | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
-index d14f36e7794f..c4be0bc00bd0 100644
---- a/connectivity/source/parse/sqlbison.y
-+++ b/connectivity/source/parse/sqlbison.y
-@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _newValue,
- 
- // yyi is the internal number of the rule that is currently being reduced
- // This can be mapped to external rule number via the yyrmap.
-+#if defined YYBISON && YYBISON >= 30800
-+#define SQL_NEW_RULE 			newNode("", SQLNodeType::Rule, yyr1[yyrule])
-+#define SQL_NEW_LISTRULE 		newNode("", SQLNodeType::ListRule, yyr1[yyrule])
-+#define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, yyr1[yyrule])
-+#else
- #define SQL_NEW_RULE 			newNode("", SQLNodeType::Rule, yyr1[yyn])
- #define SQL_NEW_LISTRULE 		newNode("", SQLNodeType::ListRule, yyr1[yyn])
- #define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, yyr1[yyn])
-+#endif
- 
- 
- extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
--- 
-cgit v1.2.1
-