[arch-commits] Commit in libreoffice-fresh/trunk (5 files)
Andreas Radke
andyrtr at gemini.archlinux.org
Thu Oct 14 15:27:12 UTC 2021
Date: Thursday, October 14, 2021 @ 15:27:12
Author: andyrtr
Revision: 425989
upgpkg: libreoffice-fresh 7.2.2-1: upstream update 7.2.2
Modified:
libreoffice-fresh/trunk/PKGBUILD
Deleted:
libreoffice-fresh/trunk/bison-3.8.patch
libreoffice-fresh/trunk/kf5_fix.patch
libreoffice-fresh/trunk/pld-skia-patches.patch
libreoffice-fresh/trunk/skia-freetype2.11.patch
-------------------------+
PKGBUILD | 30 +++++----------------------
bison-3.8.patch | 50 ----------------------------------------------
kf5_fix.patch | 39 -----------------------------------
pld-skia-patches.patch | 10 ---------
skia-freetype2.11.patch | 37 ----------------------------------
5 files changed, 6 insertions(+), 160 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-10-14 14:01:32 UTC (rev 425988)
+++ PKGBUILD 2021-10-14 15:27:12 UTC (rev 425989)
@@ -10,9 +10,9 @@
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=7.2.1.2
-pkgver=7.2.1
-pkgrel=3
+_LOver=7.2.2.2
+pkgver=7.2.2
+pkgrel=1
arch=('x86_64')
license=('LGPL3')
url="https://www.libreoffice.org/"
@@ -60,10 +60,6 @@
${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
- skia-freetype2.11.patch
- pld-skia-patches.patch
- bison-3.8.patch
- kf5_fix.patch
soffice-template.desktop.in
libreoffice-fresh.sh libreoffice-fresh.csh)
noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -87,11 +83,11 @@
185d60944ea767075d27247c3162b3bc-unowinreg.dll
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('7a16b46fb397e72fce2d06b786025f321da12ccc39c9976510674ff9119b0a4d'
+sha256sums=('813bc3caa48c3c4af35b6a48bcf9cd19305ff0b81ce9b5304052c10ce5b02b71'
'SKIP'
- '804d75b09569bb4c3e2ab24ca070467f0fa7073e48208760c6d2d52411864c95'
+ '03a177e73941b26a17fd5e0f5b92ebc759262f556847f8f97956cc497334c5c2'
'SKIP'
- '6da19cc6f5fa1b90b6602b5a5f47a12349cf98f26b69c9e2fbb360dce4a367d3'
+ '988a63ae2d50454c6f6c547b5f9331c7c45295f6d792b37fdced7557baca1ce6'
'SKIP'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@@ -113,10 +109,6 @@
'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
- '1f9506cff0c3f3638de6d1ff76f679c301f0e9aa2ab735b26274c42f16345e8e'
- '55710ab0200784c69d49c38b9be6b447502c818ca828efc825355038c8980eea'
- 'e1f46d84deb0c4e7ddbd1c5422e015940aa5ae43a5e2b8f10e88a0317aaa4ed0'
- '89fb019756c1db7fa382d8ed325b36d1d02e525ccee77c59fb15abe2b61f1770'
'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
@@ -140,16 +132,6 @@
# fix not upstreamable pyuno paths - FS#54250
patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
- # fix build with FreeType 2.11 (patches from PLD Linux)
- cp "${srcdir}"/skia-freetype2.11.patch external/skia
- patch -Np1 -i "${srcdir}"/pld-skia-patches.patch
-
- # fix build with bison 3.8
- patch -Np1 -i "${srcdir}"/bison-3.8.patch
-
- # https://bugs.documentfoundation.org/show_bug.cgi?id=144037
- patch -Np1 -i "${srcdir}"/kf5_fix.patch
-
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
Deleted: bison-3.8.patch
===================================================================
--- bison-3.8.patch 2021-10-14 14:01:32 UTC (rev 425988)
+++ bison-3.8.patch 2021-10-14 15:27:12 UTC (rev 425989)
@@ -1,50 +0,0 @@
-From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Tue, 14 Sep 2021 12:20:48 +0200
-Subject: [PATCH] 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 at 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 d14f36e7794f0..c4be0bc00bd04 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;
Deleted: kf5_fix.patch
===================================================================
--- kf5_fix.patch 2021-10-14 14:01:32 UTC (rev 425988)
+++ kf5_fix.patch 2021-10-14 15:27:12 UTC (rev 425989)
@@ -1,39 +0,0 @@
-From 7c1f4284562e905372b5c14b6017f1eb438f54b5 Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glogow at fbihome.de>
-Date: Thu, 26 Aug 2021 14:23:29 +0200
-Subject: tdf#144037 Qt5 just close popup with mouse outside
-
-How hard could it be to close a popup window when losing focus or
-clicking outside of it (AKA tdf#143114 problem 3)? At least with
-Qt it feels like solving an NP problem...
-
-So don't always force-close the popup window if clicked anywhere
-on it. Seems to be consistent with gen and gtk3.
-
-Change-Id: Ia1c231c0b51a55bec2c587feffcf14bb4b4cee55
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121093
-Tested-by: Jenkins
-Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
-(cherry picked from commit a1a83b6b3b4459de353e0cdc8cdf402370c0a5c4)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121064
-Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
----
- vcl/qt5/Qt5Widget.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
-index 864701340ad3..64ad4f7539c4 100644
---- a/vcl/qt5/Qt5Widget.cxx
-+++ b/vcl/qt5/Qt5Widget.cxx
-@@ -182,7 +182,7 @@ void Qt5Widget::mousePressEvent(QMouseEvent* pEvent)
- {
- handleMousePressEvent(m_rFrame, pEvent);
- if (m_rFrame.isPopup()
-- || !geometry().translated(geometry().topLeft() * -1).contains(pEvent->pos()))
-+ && !geometry().translated(geometry().topLeft() * -1).contains(pEvent->pos()))
- closePopup();
- }
-
---
-cgit v1.2.1
-
Deleted: pld-skia-patches.patch
===================================================================
--- pld-skia-patches.patch 2021-10-14 14:01:32 UTC (rev 425988)
+++ pld-skia-patches.patch 2021-10-14 15:27:12 UTC (rev 425989)
@@ -1,10 +0,0 @@
---- libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk.orig 2021-08-10 19:27:48.000000000 +0200
-+++ libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk 2021-08-12 18:09:22.813517161 +0200
-@@ -39,6 +39,7 @@
- fast-png-write.patch.1 \
- skia_sk_cpu_sse_level_0_by_default.patch.1 \
- fix-warnings.patch.1 \
-+ skia-freetype2.11.patch \
-
- $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
-
Deleted: skia-freetype2.11.patch
===================================================================
--- skia-freetype2.11.patch 2021-10-14 14:01:32 UTC (rev 425988)
+++ skia-freetype2.11.patch 2021-10-14 15:27:12 UTC (rev 425989)
@@ -1,37 +0,0 @@
---- skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-03-01 15:53:09.178606791 +0100
-+++ skia/src/ports/SkFontHost_FreeType_common.cpp 2021-08-12 17:48:32.358901987 +0200
-@@ -665,8 +665,13 @@
- canvas->drawPaint(paint);
- break;
- }
-+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
-+ case FT_COLR_PAINTFORMAT_TRANSFORM: {
-+ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine);
-+#else
- case FT_COLR_PAINTFORMAT_TRANSFORMED: {
- SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
-+#endif
-
- canvas->concat(transform);
- break;
-@@ -760,12 +765,20 @@
- traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
- FT_COLOR_NO_ROOT_TRANSFORM);
- break;
-+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
-+ case FT_COLR_PAINTFORMAT_TRANSFORM:
-+#else
- case FT_COLR_PAINTFORMAT_TRANSFORMED:
-+#endif
- canvas->saveLayer(nullptr, nullptr);
- // Traverse / draw operation will apply transform.
- colrv1_draw_paint(canvas, palette, face, paint);
- traverse_result =
-+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
-+ colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint);
-+#else
- colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint);
-+#endif
- canvas->restore();
- break;
- case FT_COLR_PAINTFORMAT_ROTATE:
More information about the arch-commits
mailing list