Accepting request 941891 from LibreOffice:7.2
OBS-URL: https://build.opensuse.org/request/show/941891 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=987
This commit is contained in:
parent
a47e2b2cbb
commit
130e89bd37
@ -31,31 +31,6 @@ index f4850a8cb2dc..c2df878df1d7 100644
|
|||||||
path here. Note that this is not the location of the java command but the
|
path here. Note that this is not the location of the java command but the
|
||||||
location of the entire distribution. In case of cross-compiling, this
|
location of the entire distribution. In case of cross-compiling, this
|
||||||
is the JDK of the host os. Use --with-build-platform-configure-options
|
is the JDK of the host os. Use --with-build-platform-configure-options
|
||||||
@@ -8004,12 +8004,20 @@ if test "$ENABLE_JAVA" != ""; then
|
|
||||||
reg_get_value "$WIN_HOST_BITS" "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/JDK/$ver/JavaHome"
|
|
||||||
reg_jdk_home=$regvalue
|
|
||||||
fi
|
|
||||||
-
|
|
||||||
- if test -f "$reg_jdk_home/lib/jvm.lib" -a -f "$reg_jdk_home/bin/java.exe"; then
|
|
||||||
- with_jdk_home="$reg_jdk_home"
|
|
||||||
+ if test -z "$with_jdk_home"; then
|
|
||||||
+ for ver in 1.8; do
|
|
||||||
+ reg_get_value "$bitness" "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome"
|
|
||||||
+ if test -n "$regvalue"; then
|
|
||||||
+ _jdk_home=$regvalue
|
|
||||||
+ break
|
|
||||||
+ fi
|
|
||||||
+ done
|
|
||||||
+ fi
|
|
||||||
+ if test -f "$_jdk_home/lib/jvm.lib" -a -f "$_jdk_home/bin/java.exe"; then
|
|
||||||
+ with_jdk_home="$_jdk_home"
|
|
||||||
howfound="found automatically"
|
|
||||||
else
|
|
||||||
- AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option pointing to a $WIN_HOST_BITS-bit JDK >= 9])
|
|
||||||
+ AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option pointing to a $bitness-bit JDK])
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
test "$build_os" = "cygwin" && with_jdk_home=`win_short_path_for_make "$with_jdk_home"`
|
|
||||||
@@ -8089,7 +8097,24 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then
|
@@ -8089,7 +8097,24 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then
|
||||||
elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "BEA"` -gt 0; then
|
elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "BEA"` -gt 0; then
|
||||||
AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.ac])
|
AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.ac])
|
||||||
|
23
fix_gtk_popover_on_3.20.patch
Normal file
23
fix_gtk_popover_on_3.20.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
|
||||||
|
index 6b592b3..2fce9eb 100644
|
||||||
|
--- a/vcl/unx/gtk3/gtkinst.cxx
|
||||||
|
+++ b/vcl/unx/gtk3/gtkinst.cxx
|
||||||
|
@@ -21415,12 +21415,16 @@ public:
|
||||||
|
gtk_popover_set_relative_to(m_pPopover, pWidget);
|
||||||
|
#endif
|
||||||
|
gtk_popover_set_pointing_to(m_pPopover, &aRect);
|
||||||
|
- gtk_popover_popup(m_pPopover);
|
||||||
|
+ // in GTK 3.22 you can just call gtk_popover_popup() to get it to show with transitions,
|
||||||
|
+ // but on SLE-12-SP5 we just have GTK 3.20, so enable transitions and show it to get the
|
||||||
|
+ // same effect
|
||||||
|
+ gtk_popover_set_transitions_enabled(m_pPopover, true);
|
||||||
|
+ gtk_widget_show(GTK_WIDGET(m_pPopover));
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void popdown() override
|
||||||
|
{
|
||||||
|
- gtk_popover_popdown(m_pPopover);
|
||||||
|
+ gtk_widget_hide(GTK_WIDGET(m_pPopover));
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual ~GtkInstancePopover() override
|
13
fix_math_desktop_file.patch
Normal file
13
fix_math_desktop_file.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
|
||||||
|
index 5a8192a..d2391be 100644
|
||||||
|
--- a/sysui/desktop/menus/math.desktop
|
||||||
|
+++ b/sysui/desktop/menus/math.desktop
|
||||||
|
@@ -21,7 +21,7 @@ Terminal=false
|
||||||
|
NoDisplay=false
|
||||||
|
Icon=math
|
||||||
|
Type=Application
|
||||||
|
-Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
|
||||||
|
+Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
|
||||||
|
Exec=${UNIXBASISROOTNAME} --math %%FILE%%
|
||||||
|
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml;
|
||||||
|
Name=%PRODUCTNAME Math
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510
|
|
||||||
size 16819610
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d
|
|
||||||
size 24722348
|
|
3
icu4c-69_1-data.zip
Normal file
3
icu4c-69_1-data.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf
|
||||||
|
size 16865417
|
3
icu4c-69_1-src.tgz
Normal file
3
icu4c-69_1-src.tgz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
|
||||||
|
size 24814903
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:6268b9066a60586cf0a5f5ed9960cdf86a5ff586fe6699bf4d296d580de08f21
|
|
||||||
size 252734952
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGpZaYACgkQ9DSh76/u
|
|
||||||
rqOMkhAAqkQ/J+GbTHc+AiKC1K92t/wIImwET2r0pRVLXtdgr1/uNotRZTvM4Gs9
|
|
||||||
oVLLlMZLA/EvDCmwP+w90FeXUETyGmjg3VDY24enG9NOO6/GHzaei2E7I9FB1QtA
|
|
||||||
sHA8b0ghyF1MSiRcAMtcCWLKQJZgtbuKhOi9ntBqtNH5lZnOmUZOYFAKZFWd5Bts
|
|
||||||
WvuL5OEFtY4Ub5wSTGG4uK1S9tvjO01mYS3mwB8ODKIQsgmrNg+9sVBC5Ac26ZKH
|
|
||||||
epFutjfDwmTFz8Tz9Fdll9jmFo2cd82wlYjzrvJ2NVE1ts8wnlpYKGd2/U3kg+4B
|
|
||||||
YXwjiqOOIgMbJO68qWpmUq7FiAtOEyxsyGkG958VkdAhUj2fdRfbePYoddNRfh9r
|
|
||||||
HehbEyU3APbrZ3ZXhFp9bXoNOIRtZP8Kh6Tz2mdt9udUQo0fzPeueMTZdffwzFQm
|
|
||||||
JwifbhHQAxWHUkucLSAl/AW1tbkj/vN6Z2G3Fqtopwjz6M1hEMpa6sYZIXmqGQSY
|
|
||||||
YneiiF2lMEnYAqWEDo3Pb2qFmBwBD80GpXTVxFVW0xcXX5HpXCto5zIktmVaRZVW
|
|
||||||
dPXEAkezT/oLTqPhwrwf3X34wrrnrDdl7MWpvW/C1L1gypi/Olz7c/xqUOODqxU0
|
|
||||||
JM8kdTEcXql56jMQaG6fxLL0b3IJcr6xhN0Txz890X/0vtQs2jQ=
|
|
||||||
=32bO
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
libreoffice-7.2.5.1.tar.xz
Normal file
3
libreoffice-7.2.5.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:20fd51ecce5906b32a1a33817c7f6c7917558e67a93072826c41bfef0115493c
|
||||||
|
size 252956132
|
16
libreoffice-7.2.5.1.tar.xz.asc
Normal file
16
libreoffice-7.2.5.1.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmG44Z8ACgkQ9DSh76/u
|
||||||
|
rqNLvA//agFf6ZTkJfe5yd+sVaUB9lmSDpYrPLOsB0WkYIAHQclbCWdmupfc6U3L
|
||||||
|
Msg02srrxxnECXkNnseWhjLYdPlnZwmaw3m5tpjh0UlMHue4gkdO3Rdv8GRc7+mR
|
||||||
|
GgcD1/OJms0KEW/KoUNQ/3pEMXkN8YWtMgKGASZOz6uKC0WjhXUMcHyiInefU8nt
|
||||||
|
veVyLV1iYJMzPFROeoN4ejWRi2DUozmIdMzrkig9yzZMB8gL89yfsDe/mFp5mpia
|
||||||
|
TSjNzLro2bwJGZyKHEd6eFLC8gvzWcCwNV6yDSWy4lIPnlPEubYl5MDU+tmZhwtP
|
||||||
|
tJAtjfL31Vj4XlLcZy+NudY83e5+XpCjultuz6pjy0NBkIa16dphtWCvQmbKYhR5
|
||||||
|
9DX555oYesmQRIwGu1krxgKXXfneiqNEjnxX7kF3yRG56kOIqEaEwoyJVRgBVCWc
|
||||||
|
fhZVY+jbRsn06QwelHncjBSW9wnBQFyNgTJ93hQwaf/VJCgzNXauKjl5CE79/l+t
|
||||||
|
m4Oy4J4ldoPLOkUC4QAaroYwXsp3/9OP8cCaT5iHH2XSp6XV1MSI+AJ5B3j9/g6X
|
||||||
|
N+AO57uJ123fHJVqNvXj5PhYitSna7o6zrXq65sFGlzfgoJAPHIhkx0hxo1znaqo
|
||||||
|
qV7A9jqeKUkFbNpMh62mteY1BhZJISRCzbXgpktouuY1rJ5mwLU=
|
||||||
|
=Z/OR
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ad96f57a3dc66e05ce1ce65654a28956e8abdaeacb9af1a6adda41d6fa5c6829
|
|
||||||
size 111989824
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGpZawACgkQ9DSh76/u
|
|
||||||
rqOmCw/+PT2La+67vFSLNeACmOXU2rht9odTmAstIMhZI1sHAuFplwQ21cJ7gHC9
|
|
||||||
2RSWdBLghUPLmGIrcF8Qqm7rUHway5qa17eodPkEzYHsmXVGXwaSpK6x3S2orys7
|
|
||||||
zSBzWis1/k2ua7syyMAaHNcrYRiExa6OGSWmEFS2bEl9Oo9ORJ4NOr40xHZ46k8f
|
|
||||||
Z7b/FNQDeX53WxnL4cDhedoXqLp6xvGFr+BvlqXdPmrVpJpRcbADDaE68yxq4/bw
|
|
||||||
0oT56MLMSUcfG6DtypCle/0nns+Q+QwqpJOMWfAcbLMiUtdfLY2uisRflaQ1PXYQ
|
|
||||||
V7fuv6c9m5MTx3bfNHGRgOopECiucCitdE25FhH/b4ll8/+sPw6Fs/A+xMjIrl7o
|
|
||||||
/eAppSbC0IU1KMwsvb5PK2v5NkePlY9mQoVMdiD9JVeS2IVpxaRrtH1VaMLNsFSF
|
|
||||||
gc/Abv/s9oFhTdXFZx0z2kUw7GSwDshVw/0fiuN3O0p4l9O3GlLx0JPVD8IUM1vU
|
|
||||||
TnLC6EAJBMLKVJthjYrYIs7eYHwtFz0P76ITjBh6ji+nmsMuqsJxx7+HBaZ3udH6
|
|
||||||
9NiDlOspm8Uz49CHiC1FsyfCU1fLc6s0dX0jh3QAR4+dIjJ8F+MmIrwfF3MMOq+r
|
|
||||||
l9wNHUygjtCBD3k4ZBHGkVMWKig/ig3iUwH+ZBYV/rMZPU3BaFc=
|
|
||||||
=fLgM
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
libreoffice-help-7.2.5.1.tar.xz
Normal file
3
libreoffice-help-7.2.5.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:16d00f492518a73de8f9936b58b59b2d60265945bc5d1f2cb53324592ca80a4a
|
||||||
|
size 112081364
|
16
libreoffice-help-7.2.5.1.tar.xz.asc
Normal file
16
libreoffice-help-7.2.5.1.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmG44asACgkQ9DSh76/u
|
||||||
|
rqMlsg//dMMdlqmtuWjOW1j3dk9nXuFrBulhGUmTwGZNnl/oWraCNpc3ynPOEtBR
|
||||||
|
EOFTyTKl6mIzg/MqM9K+4CFmSdkPQ2tgXq7eMYSAPdwUF8vf8K1S2oHpRkkUOPPp
|
||||||
|
hk+qhW7/pa/A/cEzG+dr5jrtx+lKachhIJep0JcqB6ACtmtg5Xj59M0Q7qJfCJQI
|
||||||
|
JymekgfD763ED5/OSA1Cx9gyg87UbJuvcqxJj38Tr+9qxYf0+sxb9t6FtS0aWZ2Y
|
||||||
|
ftnpKYNWZkf0E8et3PXtlXDtSo8tk8OTRghlqHvTZZgWvl+1fUfSA/qzqilPITgf
|
||||||
|
6fZiP12mrJ6R1fMd7uziot/WyZU84xzYnK5t5KEP7vno/6PK22z6XIhHbFWsVyQH
|
||||||
|
KTxHFoy4zZgiS8njFdSiExyPRtlLSSwtGy/YW18rws6tRmpbTBP0UWuWf/LyUZyP
|
||||||
|
B44qmE+/zWE5O810e0m+P9JQvD1W6JLbWdB7GEs+yso74tNmaITxvNYhLla1QW3c
|
||||||
|
rsnHWrKoVsRH4L5c0ijwfa4ug9xT8aYcIovegRd9mXhc25WcOYRhiFaI7R7Pv7cy
|
||||||
|
MRCdw1Fl+NSYo5mkAyCTuLi03cL1+xm6o7Le7olnPbGRSD7D8M7vj8nhoH24oIzU
|
||||||
|
/vy8hUjbDJEKhhikOky/0WagFsNGeItqOwi3fhT19dkWQmdYpyM=
|
||||||
|
=oL9w
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:f27cc2b7bfc9ee0a893ed1cead5bbb513a27270d69c6ee1f9cb589c963941daf
|
|
||||||
size 192631680
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGpZa0ACgkQ9DSh76/u
|
|
||||||
rqMd/BAAzMzL4NQepK9engrS8mcRsZmfHBc0dEcfJedt4N4KPiaMtFxcraYvlhNA
|
|
||||||
pXcAI+36VugOAwbm0pRhRsuSTbExgO2kyCzqWZ1Ns9KM4BsbNEWQKpD8y105drdS
|
|
||||||
YyKMrrCunkESQ5E4wOIEfFGgK2RbRVXLbZE61laAAtcrZoDWwItYKTZmkSyBkqeG
|
|
||||||
TozxvXGdIxx2tvgyVCO+skLCIgX2h1NgptYKBFAt0VzcNDh+G2gVfRTKSlQ5zM3h
|
|
||||||
Lno8iUdu4GC6Zat65DNtV15AB6a8aPQ0+oy8bVBHTf9qFH34HKrvrZGQJV9mlYjs
|
|
||||||
9hAfkJNZv64d0HFYC+XRWzeiz3FpdRaxUdzzgmTe/zyjcAYqqAqVdOmC8b/V2+zr
|
|
||||||
MjE1HMlz3vTv0sSUgjCEu8UUBULI6xgVK2IFl9Y3Fgr8qKLe4KV+5LwTtsLNid8p
|
|
||||||
96k9xUhw+QzW+hiZAwvSzsg11NUI3wSJgKhSvuzsdCy1hwdt23ggG1mHXZIWV1es
|
|
||||||
XW5V09S3qRnuHJNutcUE6UGVe4FQcmUCjV6VBzh4+EvFEeFtb2uY3kMnv39mv5Yk
|
|
||||||
buoYiPh26vBapHrfIlosvIWL1xKMGvQ1jAsMfM8pT74C6Hs1W/3yUUBjnVdof1SS
|
|
||||||
xpBD3Qv7THbFoh3lkDPzOlcWxw2a08Bg6W6rKzylbSp32znEozA=
|
|
||||||
=f2Hl
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
libreoffice-translations-7.2.5.1.tar.xz
Normal file
3
libreoffice-translations-7.2.5.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:989ee335ebc8d30a2bfc302aa4e9e47fd2cff83acfaf3f0d3caf8fc931923908
|
||||||
|
size 192789608
|
16
libreoffice-translations-7.2.5.1.tar.xz.asc
Normal file
16
libreoffice-translations-7.2.5.1.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmG44awACgkQ9DSh76/u
|
||||||
|
rqOjVw/9HtOad+Rfqe3BdwlPmnVES9LQQg6HCi4VF9t57EvRr0y/+LijBnzjuZe1
|
||||||
|
A+MoycvX9d4X8EM0yw3/00WOMGFE0FsJ/mXL+PeLzS0gDSu1xD5ajNGHjG25wtxp
|
||||||
|
A9WrUTuVDUqojzsgANlb3YI5tY5BSowfTuQfO+AS7lXv2ykUn+ope0jAwLlj6eRm
|
||||||
|
NxmLwMFClpJYjXYo6rMXKG1/aG/dfOTOZApVsPk3mEPdM1sVA6stJcfi55KcD9ez
|
||||||
|
J3+oibnnQoXh/0sFH1aZ9FWaaiOlyfMki5CPl+lOGZWXNEryY0uS5n2OQ4D/yc65
|
||||||
|
d9qkb2MV2QYoWh8yE0fkeO/MrdCAFcmuFrEjegSs+DntCXzq8p7QuqDBmn1b7QQv
|
||||||
|
NHLQg5GUqgRpJcBSBV6a8qcR/0g8w4jbGGqGP2tqzNhCHdW5dwELwNryY9VUfibQ
|
||||||
|
JCTV6pXLAU2QZY33Rkc+oFWVoIWNZH6g72AR9rUUlHglpE+/kgcG/sqErICBvILM
|
||||||
|
7VXEjb4qU/kD2drc5gIIp8wSVSVuWHuSJ9mNcXh6ySp9bfG7xvOKP1soFBzM1vJ7
|
||||||
|
D/BhPFjrlLT8rNPT7v37oDjbx1SxZ5PkxGgtGSUC0q9SLuoCgPQHnP+oDEjIof+n
|
||||||
|
qX7y0aIJaw9+cILfCKwTYISVfquoUWUOV8nVo8C2gXQaIB8RBFA=
|
||||||
|
=uFbB
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +1,30 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 20 15:57:19 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
|
||||||
|
|
||||||
|
- Update to 7.2.5.1
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 16 15:07:26 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
|
||||||
|
|
||||||
|
- Removed unrecognized option `--disable-vlc`
|
||||||
|
This option has been removed from upstream in commit
|
||||||
|
https://gerrit.libreoffice.org/c/core/+/108283
|
||||||
|
There's no real change in our build given that the
|
||||||
|
VLC avmedia backend was explicitly disabled.
|
||||||
|
* Fix provided by Marina Latini
|
||||||
|
- Fix gtk popover usage on gtk 3.20
|
||||||
|
* patch provided by Gustavo Boiko fix_gtk_popover_on_3.20.patch
|
||||||
|
- Revert upstream commit https://gerrit.libreoffice.org/c/core/+/116884
|
||||||
|
* patch provided by Gustavo Boiko fix_math_desktop_file.patch
|
||||||
|
- Fix generated list of files for python scripts
|
||||||
|
- Use older syntax for Supplements on SLE12
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 7 17:01:43 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
|
||||||
|
|
||||||
|
- Add and update minimum version of dependencies
|
||||||
|
- Refresh 0001-Revert-java-9-changes.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Dec 6 23:21:53 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
|
Mon Dec 6 23:21:53 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
%endif
|
%endif
|
||||||
%bcond_with firebird
|
%bcond_with firebird
|
||||||
Name: libreoffice
|
Name: libreoffice
|
||||||
Version: 7.2.4.1
|
Version: 7.2.5.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A Free Office Suite (Framework)
|
Summary: A Free Office Suite (Framework)
|
||||||
License: LGPL-3.0-or-later AND MPL-2.0+
|
License: LGPL-3.0-or-later AND MPL-2.0+
|
||||||
@ -107,6 +107,8 @@ Patch6: gcc11-fix-error.patch
|
|||||||
Patch7: pld-skia-patches.patch
|
Patch7: pld-skia-patches.patch
|
||||||
# PATCH-FIX-UPSTREAM https://bugs.documentfoundation.org/show_bug.cgi?id=137924 Use proper DPI without requiring window handle
|
# PATCH-FIX-UPSTREAM https://bugs.documentfoundation.org/show_bug.cgi?id=137924 Use proper DPI without requiring window handle
|
||||||
Patch8: fix-wayland-scaling-in-plasma.patch
|
Patch8: fix-wayland-scaling-in-plasma.patch
|
||||||
|
Patch9: fix_math_desktop_file.patch
|
||||||
|
Patch10: fix_gtk_popover_on_3.20.patch
|
||||||
# Build with java 8
|
# Build with java 8
|
||||||
Patch101: 0001-Revert-java-9-changes.patch
|
Patch101: 0001-Revert-java-9-changes.patch
|
||||||
# try to save space by using hardlinks
|
# try to save space by using hardlinks
|
||||||
@ -180,7 +182,7 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
|
|||||||
BuildRequires: pkgconfig(graphite2) >= 0.9.3
|
BuildRequires: pkgconfig(graphite2) >= 0.9.3
|
||||||
BuildRequires: pkgconfig(gssrpc)
|
BuildRequires: pkgconfig(gssrpc)
|
||||||
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
|
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
|
||||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.18
|
BuildRequires: pkgconfig(gtk+-3.0) >= 3.20
|
||||||
BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
|
BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
|
||||||
BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42
|
BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42
|
||||||
BuildRequires: pkgconfig(hunspell)
|
BuildRequires: pkgconfig(hunspell)
|
||||||
@ -189,11 +191,11 @@ BuildRequires: pkgconfig(lcms2)
|
|||||||
BuildRequires: pkgconfig(libabw-0.1)
|
BuildRequires: pkgconfig(libabw-0.1)
|
||||||
BuildRequires: pkgconfig(libcdr-0.1) >= 0.1
|
BuildRequires: pkgconfig(libcdr-0.1) >= 0.1
|
||||||
BuildRequires: pkgconfig(libclucene-core)
|
BuildRequires: pkgconfig(libclucene-core)
|
||||||
BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1
|
BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.2
|
||||||
BuildRequires: pkgconfig(libeot) >= 0.01
|
BuildRequires: pkgconfig(libeot) >= 0.01
|
||||||
BuildRequires: pkgconfig(libepubgen-0.1)
|
BuildRequires: pkgconfig(libepubgen-0.1)
|
||||||
BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.10
|
BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.10
|
||||||
BuildRequires: pkgconfig(libexttextcat) >= 3.1.1
|
BuildRequires: pkgconfig(libexttextcat) >= 3.4.1
|
||||||
BuildRequires: pkgconfig(libfreehand-0.1)
|
BuildRequires: pkgconfig(libfreehand-0.1)
|
||||||
BuildRequires: pkgconfig(liblangtag)
|
BuildRequires: pkgconfig(liblangtag)
|
||||||
BuildRequires: pkgconfig(libmspub-0.1) >= 0.1
|
BuildRequires: pkgconfig(libmspub-0.1) >= 0.1
|
||||||
@ -222,7 +224,7 @@ BuildRequires: pkgconfig(nss) >= 3.9.3
|
|||||||
BuildRequires: pkgconfig(python3)
|
BuildRequires: pkgconfig(python3)
|
||||||
BuildRequires: pkgconfig(redland)
|
BuildRequires: pkgconfig(redland)
|
||||||
BuildRequires: pkgconfig(sane-backends)
|
BuildRequires: pkgconfig(sane-backends)
|
||||||
BuildRequires: pkgconfig(serf-1) >= 1.1.0
|
BuildRequires: pkgconfig(serf-1) >= 1.3.9
|
||||||
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.28
|
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.28
|
||||||
BuildRequires: pkgconfig(xrandr)
|
BuildRequires: pkgconfig(xrandr)
|
||||||
BuildRequires: pkgconfig(xt)
|
BuildRequires: pkgconfig(xt)
|
||||||
@ -260,7 +262,7 @@ ExclusiveArch: aarch64 %{ix86} x86_64 ppc64le
|
|||||||
%if 0%{?suse_version} < 1550
|
%if 0%{?suse_version} < 1550
|
||||||
# Too old boost on the system
|
# Too old boost on the system
|
||||||
Source2020: %{external_url}/boost_1_75_0.tar.xz
|
Source2020: %{external_url}/boost_1_75_0.tar.xz
|
||||||
Source2023: %{external_url}/poppler-21.01.0.tar.xz
|
Source2023: %{external_url}/poppler-21.11.0.tar.xz
|
||||||
Source2024: %{external_url}/poppler-data-0.4.10.tar.gz
|
Source2024: %{external_url}/poppler-data-0.4.10.tar.gz
|
||||||
%else
|
%else
|
||||||
BuildRequires: libboost_date_time-devel
|
BuildRequires: libboost_date_time-devel
|
||||||
@ -273,8 +275,8 @@ BuildRequires: pkgconfig(poppler-cpp)
|
|||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version} < 1500
|
%if 0%{?suse_version} < 1500
|
||||||
# Too old icu on the system
|
# Too old icu on the system
|
||||||
Source2021: %{external_url}/icu4c-68_1-src.tgz
|
Source2021: %{external_url}/icu4c-69_1-src.tgz
|
||||||
Source2022: %{external_url}/icu4c-68_1-data.zip
|
Source2022: %{external_url}/icu4c-69_1-data.zip
|
||||||
BuildRequires: gcc7
|
BuildRequires: gcc7
|
||||||
BuildRequires: gcc7-c++
|
BuildRequires: gcc7-c++
|
||||||
BuildRequires: java-devel >= 1.8
|
BuildRequires: java-devel >= 1.8
|
||||||
@ -301,6 +303,10 @@ BuildConflicts: java < 9
|
|||||||
BuildConflicts: java-devel < 9
|
BuildConflicts: java-devel < 9
|
||||||
BuildConflicts: java-headless < 9
|
BuildConflicts: java-headless < 9
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
# needed by python3_sitelib
|
||||||
|
BuildRequires: python-rpm-macros
|
||||||
|
%endif
|
||||||
%if %{with system_gpgme}
|
%if %{with system_gpgme}
|
||||||
BuildRequires: libgpgmepp-devel
|
BuildRequires: libgpgmepp-devel
|
||||||
%endif
|
%endif
|
||||||
@ -364,7 +370,11 @@ Provides: libreoffice-branding-openSUSE = 4.0.1
|
|||||||
Obsoletes: libreoffice-branding-openSUSE < 4.0.1
|
Obsoletes: libreoffice-branding-openSUSE < 4.0.1
|
||||||
Provides: libreoffice-branding-SLE = 4.0.1
|
Provides: libreoffice-branding-SLE = 4.0.1
|
||||||
Obsoletes: libreoffice-branding-SLE < 4.0.1
|
Obsoletes: libreoffice-branding-SLE < 4.0.1
|
||||||
|
%if 0%{suse_version} < 1500
|
||||||
|
Supplements: packageand(libreoffice:branding-openSUSE)
|
||||||
|
%else
|
||||||
Supplements: (libreoffice and branding-openSUSE)
|
Supplements: (libreoffice and branding-openSUSE)
|
||||||
|
%endif
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description branding-upstream
|
%description branding-upstream
|
||||||
@ -573,12 +583,21 @@ This package contains some GNOME extensions and GTK2 interface for LibreOffice.
|
|||||||
Summary: Gtk3 interface for LibreOffice
|
Summary: Gtk3 interface for LibreOffice
|
||||||
Group: Productivity/Office/Suite
|
Group: Productivity/Office/Suite
|
||||||
Requires: %{name}-gnome = %{version}
|
Requires: %{name}-gnome = %{version}
|
||||||
|
%if 0%{suse_version} < 1500
|
||||||
|
Supplements: packageand(libreoffice:gnome-session)
|
||||||
|
Supplements: packageand(libreoffice:mate-session-manager)
|
||||||
|
Supplements: packageand(libreoffice:xfce4-session)
|
||||||
|
%if !%{with kdeintegration}
|
||||||
|
Supplements: packageand(libreoffice:plasma5-workspace)
|
||||||
|
%endif
|
||||||
|
%else
|
||||||
Supplements: (libreoffice and gnome-session)
|
Supplements: (libreoffice and gnome-session)
|
||||||
Supplements: (libreoffice and mate-session-manager)
|
Supplements: (libreoffice and mate-session-manager)
|
||||||
Supplements: (libreoffice and xfce4-session)
|
Supplements: (libreoffice and xfce4-session)
|
||||||
%if !%{with kdeintegration}
|
%if !%{with kdeintegration}
|
||||||
Supplements: (libreoffice and plasma5-workspace)
|
Supplements: (libreoffice and plasma5-workspace)
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%description gtk3
|
%description gtk3
|
||||||
This package contains Gtk3 interface rendering option for LibreOffice.
|
This package contains Gtk3 interface rendering option for LibreOffice.
|
||||||
@ -587,7 +606,11 @@ This package contains Gtk3 interface rendering option for LibreOffice.
|
|||||||
Summary: Qt5/KDE Frameworks interface for LibreOffice
|
Summary: Qt5/KDE Frameworks interface for LibreOffice
|
||||||
Group: Productivity/Office/Suite
|
Group: Productivity/Office/Suite
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}
|
||||||
|
%if 0%{suse_version} < 1500
|
||||||
Supplements: packageand(libreoffice:plasma5-workspace)
|
Supplements: packageand(libreoffice:plasma5-workspace)
|
||||||
|
%else
|
||||||
|
Supplements: (libreoffice and plasma5-workspace)
|
||||||
|
%endif
|
||||||
Provides: %{name}-kde4 = %{version}
|
Provides: %{name}-kde4 = %{version}
|
||||||
Obsoletes: %{name}-kde4 < %{version}
|
Obsoletes: %{name}-kde4 < %{version}
|
||||||
|
|
||||||
@ -987,7 +1010,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
|
|||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
%if 0%{?suse_version} < 1500
|
%if 0%{?suse_version} < 1500
|
||||||
|
%patch10 -p1
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch990 -p1
|
%patch990 -p1
|
||||||
@ -1148,7 +1173,6 @@ export NOCONFIGURE=yes
|
|||||||
--enable-scripting-beanshell \
|
--enable-scripting-beanshell \
|
||||||
--enable-scripting-javascript \
|
--enable-scripting-javascript \
|
||||||
--enable-build-opensymbol \
|
--enable-build-opensymbol \
|
||||||
--disable-vlc \
|
|
||||||
--disable-ccache \
|
--disable-ccache \
|
||||||
--disable-coinmp \
|
--disable-coinmp \
|
||||||
--enable-symbols \
|
--enable-symbols \
|
||||||
@ -1339,8 +1363,10 @@ for i in file-lists/*.txt; do
|
|||||||
# python3 has __pycache__ dir while py2 does not
|
# python3 has __pycache__ dir while py2 does not
|
||||||
pydir="${j%/*}"
|
pydir="${j%/*}"
|
||||||
pyname="${j##*/}"
|
pyname="${j##*/}"
|
||||||
echo "%dir ${pydir}/__pycache__/" >> "${i}"
|
if compgen -G "%{buildroot}${pydir}/__pycache__/${pyname%.*}*.pyc" > /dev/null; then
|
||||||
echo "${pydir}/__pycache__/${pyname%.*}*.pyc" >> "${i}"
|
echo "%dir ${pydir}/__pycache__/" >> "${i}"
|
||||||
|
echo "${pydir}/__pycache__/${pyname%.*}*.pyc" >> "${i}"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3
|
|
||||||
size 1680536
|
|
3
poppler-21.11.0.tar.xz
Normal file
3
poppler-21.11.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584
|
||||||
|
size 1783592
|
Loading…
Reference in New Issue
Block a user