pool/libreoffice
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1108

Browse Source
This commit is contained in:
Fridrich Strba 2023-08-08 19:35:37 +00:00 committed by Git OBS Bridge
parent 4a108b9853
commit ac50a57967
17 changed files with 114 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fix_harfbuzz_on_sle12_sp5.patch
View File

@ -1,26 +0,0 @@
Index: libreoffice-7.5.1.2/vcl/source/font/fontmetric.cxx
===================================================================
--- libreoffice-7.5.1.2.orig/vcl/source/font/fontmetric.cxx
+++ libreoffice-7.5.1.2/vcl/source/font/fontmetric.cxx
@@ -549,20 +549,7 @@ void ImplFontMetricData::ImplInitBaselin
double fScale = 0;
pFontInstance->GetScale(nullptr, &fScale);
hb_position_t nBaseline = 0;
-
- if (hb_ot_layout_get_baseline(pHbFont,
- HB_OT_LAYOUT_BASELINE_TAG_HANGING,
- HB_DIRECTION_INVALID,
- HB_SCRIPT_UNKNOWN,
- HB_TAG_NONE,
- &nBaseline))
- {
- mnHangingBaseline = nBaseline * fScale;
- }
- else
- {
- mnHangingBaseline = 0;
- }
+ mnHangingBaseline = 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

3
harfbuzz-7.3.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb
size 18867940

3
harfbuzz-8.0.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79
size 18793316

3
libreoffice-7.6.0.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c2d7b942c062c22198586e5c41f8ab4b7ef8214dc8c4a67eaec979a35983630
size 279453164

16
libreoffice-7.6.0.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSoQ+4ACgkQ9DSh76/u
rqNDUw/6AlRcokNFLM1DYSgubB1INEHA68V4Apx673zwX5YKdCUBnEYVSLVNIAyM
XFl/N5OyyMXak6052rdjUAlAwwOlzoCv/N9trFPOO/XHerdv4AVf4EFPwsCQKfaM
tSNMHcXiC0Q9N56uVlcKe9zG0ZEghMnW3HxHdf0GZ8R4QTPmHOt3Dgre7ItAtk5d
r6xqIQnUlqJ1tVXh3mbyfa92Xs4E+1pj5wufYZEmFPrpRSeclCcHQfaAXKozcU7r
eBun4iC6ZJ5bCN5OvGOh+KsyKO7fwdRsqFIwAakYGa++fStihiI0SnC8wtUxjgZ0
w0GK+o8xSoUjNlvfB5BhjQ5sRRNdW5/axESxXTpUg7QfUzvcE35JZVPinWtQbAxP
lsSrgFFqabk6RVYoRmTgET+er3IoOSxXqfZx6qc76aySjyCWnbFyifrRvZ831Qx3
EvD0LefzGtm79vSdPk1A41eczfrMrlTaaIwX78kmX+Fa/OJtOtPqBvOHjuyfC7a3
Y+uMKUupfTF6uxfdmabwdRb+RjMFZJX77zw0aIcD7Lx48gVQ4Gtd3xRhVCGzO92X
OXwyiaxJ0mpQu6XC9LsK3B9ZvgSiWw6NV+oNSdKV9RiOnTzS6fVj/iUZr5YOIdUq
nYKFgSZx4hcyV36d7YkGlgK2y3GuFm3Mt1FD7fLKO99nkbdMdng=
=qUMt
-----END PGP SIGNATURE-----

3
libreoffice-7.6.0.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b782a7c1189efdb3205e58423fde9241cf37ebfbb3da4c7300f2de6bb45147cd
size 279991368

16
libreoffice-7.6.0.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmTEBtUACgkQ9DSh76/u
rqOnkg//UUUkyhZwjsH64RoRYZN9FmOErlWfTKHclcgGmj1TB3+x9qGBBx0yG5xV
/p/RudPE4GVZ7r52HWdbsg8ptL44H1aXzkFEtLztX2Sq3YB7LCn9rDR3lEv5jxUW
TYtBzpR8aIh1jXWTphJpUCA/8R3TIa+ifpV2AD69OZysLUlmKmRIYWq1y2IP2dY8
hO0Nwgfs/Rz7KsCqHXlpQJJayNdmWn2OiPnQUrLIkXgsjaAIVQ8OWkaSqQBtvxhI
NZtHbf8fy7PTmATYWeaTqfd0M1PjxOudB6HS/Om0PrScHoLBnVpgiraR5SMiUwGp
atT6151ceVLFe80JMg+j8xWTZmad1m8INOxzbqK1byZJMtNWdBj91oEeZRk7Iv0m
nfX2qyqtiQ3rXT/uR7SUivRMixIVnCLlq/wlYZmX0Jj5R/pgBa1dEByG5i5w4ZM3
6UCH1n6005PLdPL5SFUUiMcYqexbDKha+1mK7be8e27hhDOIuQ9RdiqdiykmhvF4
A9VxbQSdtoVUTNWu4pw+XrksuXZIQpTZITVTKTcJgIq+H+rgSnkW3MvKzevjFN4w
L483al9aRtGuXSZrgn1GIKRbbeb5Q5MVdMeJMa4JTzKItLY558+ItXlmfLEA4/+V
yjo3vUR+iL0eaEeqXDr2egPo3Wxe0qPGrTg+lOCLP2x/m0Pqn1o=
=cvu3
-----END PGP SIGNATURE-----

3
libreoffice-help-7.6.0.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7b85e9f0fa3a224060c01401be4eb580ecacfb2bf23a5ef16f183785a367e99
size 166959152

16
libreoffice-help-7.6.0.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSoQ/QACgkQ9DSh76/u
rqOWHA//baxlyJ+ilzTG0JFpfnKAo4IHZ2ynyZLgQ9glbei1hOIu2q8DZ2WgFpow
L6hOAbV50bxkzEmJ6R+JQYu9uOkQdQaTm12ypjyZHYm2BcyNuT80yLpU4nQSRU8h
c5rQahVevVFL8Mx6Et/Yn7CF96x/vh7DjAr8qUzByMb7WDc9qVz8f6kDT6XTlFlB
nPKlXr/VbToh80Pb3ZEnxMGjLpsAOCztVAgZfLYpIKARRn2yNiGydmb4W4vTrdYp
wGEfB49wA5DbZYxMlJN8d3ZWsvde6QqqiRGbvYygCTfeb6hz0efzJkTFHTkzHzqp
VOBnXu1XsK28tMU/izZwJ/DqJRSfJoaPI+2gNsVqByyrMkRPihCxbniSWKkBqlvQ
0/b9qyG9KeDK7SEF0MV9mPl18L84wF0AyGc7uPGOqLXWCSeld/ZDI7RWo5pcO0CP
uhMuO4/TQ7fTV4mohlo+DXrSiq7LGk3snNbPDxTxQx2vRESn6WOod5IWmyT0tf/n
nO9vs/ftJIz9AQ4nRE5wIHPMARgRbaXN5M6Y5C2MWrIJCzQT4midgRxmTGHV178Y
tCcdwMMhgW1TU21MrnR9oUiXR3ExGDEMebTf72/K3al4d81dyECwda7fr4iYwb8a
hcyvR46JZk+Wx2n9LLn6QrgYgsK191fxLCiiPFVkzcRjJBPe7DM=
=aVms
-----END PGP SIGNATURE-----

3
libreoffice-help-7.6.0.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f7ce1b54bf03b54bf788d8bd81241e38060362e983883b202f0c453e7622f9ea
size 166959328

16
libreoffice-help-7.6.0.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmTEBt4ACgkQ9DSh76/u
rqM/Ew/+NjyznVZGI6qRZ9uLtLdWYlhifamrTgh6UZoS7D2iIS15reQpvmO20PHH
TkwALkbUC33V/dKWAy8+e8dYX94Lgh/Z35HRvSRfscKns92aADRk/lbbMHx7Jsc0
LAC2GMG7wm5sEVIvWBACGpf9qhrg8i20C+66SEDZej2/UarbDyj6kWzwQ6vKW4QE
qbCT+pfEsYSin+RMHZhvlhuV56PCpUSsXSwXAVfdvQDFgd7cQ3xRoIO+MK2G24QT
LA600yq4F7VyK9GQPYyMVmXw7lyJH/L56Jm8jip18uUdvNSKjom2iYARw6sHyqk3
Is5RXtmLlOzjPCBTircco6CHhchi9oybMNplBGlBk1fDmhrt3TM6DfmxnS0aO9HF
jEITwKWY06RclznbMvX9H9zwiNidGkFNVTrDLBzHPMMNbrtLvLWACzT5BOQI7Zz2
Ep2nZZ0QLdKSVqa6GU4j7/UyBZbwNlsjodRo+Z6/rUxQB3CkoPEGSPFMO+MjmTJq
FnnE9cMOt3aeBMlzvJwKmcDprqexw4p2j5qH0x3tqfNjGTDjyz0cR+K8Cf6HglHJ
1JVOznzFVycv5jixhzG6WfwUropasyyUXXxtcUhCzgg/DKFt0mu1MxlBYaWdyBmg
NRsqxEi9zPinmoa5N9zcEEyuPhQt5mZOAGSC8ZXBbvDSae/BPSE=
=SUwA
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.6.0.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8edd2fb3c8f4f80416f52b40fdfeca775469b1660706721a07d10e5711a245b
size 216354424

16
libreoffice-translations-7.6.0.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSoQ/QACgkQ9DSh76/u
rqMV0xAAuvFagEKJYKEqG5CccoHuSJiWSWw+1nPVW7w15GEp+8F78yTbi9LL4tt4
A4Gh4OZFR40Rfb5OK9SBV6+7ybvCPuHthOGd/C7ltJ3ZBK1BbYAIaaAwh9Fj3hct
LIgIuS/3wWtSqjoB3/+kLFDXVnX2OUKQePYAjtugIzLC92n2KMHcmd2WbJUrQkX/
5h+I+vVRKBmfbuGxekmIhU22Rv5GdL9VatGh9QnzXy+WDwn5s9QutpUsKPsVBkwa
iSj5C9cM+fJulrBc5JjfDhXYhj6Z8LgtnJZ+tGJYDK3ezKzoAvoycgwCRUMzLPLK
pF6HsCzRDEjmhSbG0t5/PbXGo/70AFy/oNdXppnhFjB3/FkTl0XVNoG5q6nsxjoJ
nqogQjRmdkKTTXB3L4Tm5DROo6ftkoofhhoCweYwYTcq5kunCUj8rXv6Gi7igOSL
kmWu45UKRKQH0Pf7SWBY2pbkm7oeKUg+B6a/YI73j7bIBHmy5jqPLV09NQhf6P/d
GWb7GSTL6hxwC1NaZ4V/MHa8Nh580vgSkkPbp3lWy6yOAXmfERmwg0JSOMnqqjD5
4WPrrj45AaUARyBoiemPlp45TBpOLYudwOgjbt1LiMvxk8ZidJ8kd13vhkrBJq0P
brvz4iIEtBjnLQ23Kaejm9As1BdAR8jg93hJMzPUVQg1knnomXU=
=x9Ly
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.6.0.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42a3591d5db65c452247e2dac84ac8371cff0e32b2d3d6ee946743223a92c73a
size 216453452

16
libreoffice-translations-7.6.0.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmTEBt8ACgkQ9DSh76/u
rqOFyQ//UptJxlC3wWNEK49oIAIc713BbnfvMluN3JSRif6X2x1MAy6jG6fyjpQw
fimvxZOQbW/iDKdyXrqJf1rqjPu2F0JTfehAlVpaZAWnjNuucfkhI5vdJ0wqyBxY
BT7ZaCgNh7OXRafUTzHVagZ3Kshy4GEAp6UQIk/9PxrEdq6hcAUk2+0kD/Nuwr9X
N831jizcInON45zmHad3kDJU+M/U4tpF9KsKp0KFqJ60O3s26ow+3b58LkZ8CTP4
Ogt4hUWXZPspeIiGyD7oKwzaa3y2Q5ecpkyJfylnsgxm11MoNPf9tZXjmWwT1hhY
QdXIShGqw823r3uyCzd08LTGWzAOK449mc5EPBFG/mrVQ9l4vu0E1LfmapI345u7
CspJFp8xTgs+6w14PD0aofAfNBhxOFRVIksB+wSPCeuCVEmIEIkzh/i3184kscJQ
U/gB/o5refJo4tz7PPA6E8G4YtIPj3u23c+6BT/1qtMQ636IHD0ssfCDPrkuNl65
hNkom3uYKGSgZZVvRVrkXPWliPMWUWr6vv+cHOvmEUNGe7Z/i0g1fGoFvU2tcBxS
CTJfVdso4vCW3BQ2LDA7HEdhylOPf2Psp4W43YNZANvnhS9e0AThebfwMsP/HujN
srQ+qBrweuebJB+a37u/bNAsVC3vbYmJ906Mjy7YcZAcu/UHqas=
=0rMO
-----END PGP SIGNATURE-----

11
libreoffice.spec
View File

@ -52,7 +52,7 @@
%endif
%bcond_with firebird
Name: libreoffice
Version: 7.6.0.1
Version: 7.6.0.2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -111,7 +111,6 @@ Patch6: gcc11-fix-error.patch
Patch9: fix_math_desktop_file.patch
Patch10: fix_gtk_popover_on_3.20.patch
Patch11: fix_webp_on_sle12_sp5.patch
Patch12: fix_harfbuzz_on_sle12_sp5.patch
# PATCH-FIX-SUSE use fixmath shared library
Patch14: use-fixmath-shared-library.patch
# PATCH-FIX-SUSE Fix make distro-pack-install
@ -126,6 +125,8 @@ Patch990: install-with-hardlinks.diff
Patch991: libreoffice-no-destdircheck.patch
# Fix build on i586
Patch992: atklistener-32bit-type-mismatch.patch
# Fix build on sle12
Patch993: python34-no-f-strings.patch
BuildRequires: %{name}-share-linker
BuildRequires: ant
BuildRequires: autoconf
@ -209,7 +210,7 @@ BuildRequires: pkgconfig(graphite2) >= 0.9.3
BuildRequires: pkgconfig(harfbuzz) >= 2.6.8
BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8
%else
Source2025: %{external_url}/harfbuzz-7.3.0.tar.xz
Source2025: %{external_url}/harfbuzz-8.0.0.tar.xz
Source2026: %{external_url}/graphite2-minimal-1.3.14.tgz
%endif
BuildRequires: pkgconfig(hunspell)
@ -1023,7 +1024,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%if 0%{?suse_version} < 1500
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch101 -p1
%endif
%patch14 -p1
@ -1034,6 +1034,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch990 -p1
%patch991 -p1
%patch992 -p1
%if 0%{?suse_version} < 1550
%patch993 -p1
%endif
# Disable some of the failing tests (some are random)
%if 0%{?suse_version} < 1330

47
python34-no-f-strings.patch Normal file
View File

@ -0,0 +1,47 @@
--- libreoffice-7.6.0.1/solenv/bin/desktop-translate.py 2023-08-08 19:29:16.088847384 +0200
+++ libreoffice-7.6.0.1/solenv/bin/desktop-translate.py 2023-08-08 19:36:37.413324064 +0200
@@ -62,7 +62,7 @@
o = parser.parse_args()
if o.template_dir is None:
- template_dir = f"{o.workdir}/{o.prefix}"
+ template_dir = '{}/{}'.format(o.workdir, o.prefix)
else:
template_dir = o.template_dir
@@ -85,7 +85,7 @@
entry = {}
# For every section in the specified ulf file there should exist
# a template file in $workdir ..
- entry["outfile"] = f"{template_dir}{template}.{o.ext}"
+ entry["outfile"] = "{}{}.{}".format(template_dir, template, o.ext)
entry["translations"] = {}
entry["key"] = key
templates[heading] = entry
@@ -130,12 +130,12 @@
if o.ext == "str":
continue
sys.exit(
- f"Warning: No template found for item '{template}' : '{outfilename}'\n"
+ "Warning: No template found for item '{}' : '{}'\n".format(template, outfilename)
)
processed += 1
# open output file
- tmpfilename = f"{outfilename}.tmp"
+ tmpfilename = '{}.tmp'.format(outfilename)
outfile = io.open(tmpfilename, "w", encoding="utf-8")
# emit the template to the output file
@@ -157,9 +157,9 @@
if o.ext in ("desktop", "str"):
if o.ext == "desktop":
value = encode_desktop_string(value)
- outfile.write(f"{OUTKEY}[{locale}]={value}\n")
+ outfile.write(u"""{}[{}]={}\n""".format(OUTKEY, locale, value))
else:
- outfile.write(f"\t[{locale}]{OUTKEY}={value}\n")
+ outfile.write(u"""\t[{}]{}={}\n""".format(locale, OUTKEY, value))
template_file.close()