Accepting request 961690 from LibreOffice:Factory

OBS-URL: https://build.opensuse.org/request/show/961690
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=248
This commit is contained in:
Dominique Leuenberger 2022-03-15 18:03:55 +00:00 committed by Git OBS Bridge
commit 5ab70500eb
16 changed files with 85 additions and 70 deletions

View File

@ -393,7 +393,7 @@ index 39887dee6e5b..dc7d02e8904a 100644
mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(1)) && \
$(if $(filter-out $(JARDEPS),$(4)), \ $(if $(filter-out $(JARDEPS),$(4)), \
rm -rf $(call gb_JavaClassSet_get_classdir,$(2))/* && \ rm -rf $(call gb_JavaClassSet_get_classdir,$(2))/* && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,\
- $(filter-out $(JARDEPS) $(T_JAVA9FILES),$(4))) && \ - $(filter-out $(JARDEPS) $(T_JAVA9FILES),$(4))) && \
- $(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) \ - $(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) \
+ $(filter-out $(JARDEPS),$(4))) && \ + $(filter-out $(JARDEPS),$(4))) && \
@ -404,7 +404,7 @@ index 39887dee6e5b..dc7d02e8904a 100644
@$$RESPONSEFILE &&) \ @$$RESPONSEFILE &&) \
rm -f $$RESPONSEFILE &&) \ rm -f $$RESPONSEFILE &&) \
- $(if $(T_MODULENAME),\ - $(if $(T_MODULENAME),\
- RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ - RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),500,\
- $(T_JAVA9FILES)) && \ - $(T_JAVA9FILES)) && \
- $(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \ - $(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \
- $(gb_JavaClassSet_JAVACDEBUG) \ - $(gb_JavaClassSet_JAVACDEBUG) \

View File

@ -1,11 +1,11 @@
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx Index: libreoffice-7.3.1.3/vcl/unx/gtk3/gtkinst.cxx
index 6b592b3..2fce9eb 100644 ===================================================================
--- a/vcl/unx/gtk3/gtkinst.cxx --- libreoffice-7.3.1.3.orig/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx +++ libreoffice-7.3.1.3/vcl/unx/gtk3/gtkinst.cxx
@@ -21415,12 +21415,16 @@ public: @@ -22177,7 +22177,11 @@ public:
gtk_popover_set_relative_to(m_pPopover, pWidget); }
#endif #endif
gtk_popover_set_pointing_to(m_pPopover, &aRect);
- gtk_popover_popup(m_pPopover); - gtk_popover_popup(m_pPopover);
+ // in GTK 3.22 you can just call gtk_popover_popup() to get it to show with transitions, + // 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 + // but on SLE-12-SP5 we just have GTK 3.20, so enable transitions and show it to get the
@ -14,10 +14,13 @@ index 6b592b3..2fce9eb 100644
+ gtk_widget_show(GTK_WIDGET(m_pPopover)); + gtk_widget_show(GTK_WIDGET(m_pPopover));
} }
virtual void popdown() override #if !GTK_CHECK_VERSION(4, 0, 0)
{ @@ -22218,7 +22222,7 @@ public:
}
#endif
- gtk_popover_popdown(m_pPopover); - gtk_popover_popdown(m_pPopover);
+ gtk_widget_hide(GTK_WIDGET(m_pPopover)); + gtk_widget_hide(GTK_WIDGET(m_pPopover));
} }
virtual ~GtkInstancePopover() override void PopdownAndFlushClosedSignal()

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIdKXsACgkQ9DSh76/u
rqNgew//X6FANTeNXlwrCe8HMVg2n9O2JR5mVBhNNUnHB1SyLBOTe2mSoWA6eQth
cpNWSUeXgKZZcWpEbH8sM4kZ+msP5MbbgRpoJADYHClegsFyBuLQvkDCa67TxIDI
Qa61DO2fb5+HDTzfjmKEaOEUI4eoIag7ItjHfc/sl/k+fg69KosdXrv8POtWeg+e
D7/0DK3GgSvaNnwfLLCPGiow7FPfud5xYDgLhHuILtn5EEyZFc8nscWtqTqV/mTz
vuZyCyKUe73OxjaolfHZnVaIjMdLbedhje8xoPdg3GsM7AFb2xS/F2exH9kQlvmB
nM2uOKulfpRGc3QUr7fsJfdeGpfzZxg+TT/SHgibyI086UHzIuRhTBqBUPToOnMs
kXIKuXYd6srXMZ8rcW+LWhjU3mZbzTyRS54pUbW09z+p2uYLpSTfgkNZKyu9whoZ
K7j6kCo67xKT4O04JD0bDotncasKcTggnTm0FqoHeXxeJR0XSHhZhQAxGD4D8QD7
jpVEGz4KREYidLR1AfpqVm3mgSrbMwXnb0lidOKPVgJMHI1xENZJSbBiZGkWjm7t
UY9JsfJcA6Irc39jHTjgVAWoy2FxXi2lhTNB/NSGmHH7Q+ZyuB4WnBjZKUqw8m0x
wEBPK/1iKtJxmLpaDdtjqSXI5IDqUcoGQDyD2LPjhFvLR+7zSVo=
=RfmA
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIo/mYACgkQ9DSh76/u
rqOQjxAApMIG1qzzO1Mgie4LFe9+8tLdVjBJMwGOBQWPSfo+HrMsI+qZ6BFprEGc
O+mcogyeZqbXFUPg8fD89JWZ5K44e2SS1eGtlTClDB/cvYU62xqZYrhjKlhyfWlE
cG8ZS+pguFV0DFtMDxYG9q3A27PcTt3SPds286OFEfY8RhmZJUJGafL6IX34P0eg
UqtTUVgsj6XQbGeaD8EwQVbY/9KmUWs0poigS9mbaUOiygdYfIhByFaAi6XZYDK1
KQFT8ly8IRZwkiwlwosSOr8gctFHEbxYgBm6ZCtfabsF9kB5KH6BUbCOwk9AqcyH
TjhM/oskwVvC18GDW8IZm8S/IpE31wOOESIKz/urFSnR/YpmaU4R/K3+yyjD+yUf
FJjThT/y0rgjGIz+oREgcmeFipx32PdNB9iFvd1IQK6wzCWgkc6B7+/rZo4jb8bR
nSOS3vXPRRkeMopFJlcpjgndGYu4gOqJMqJfH2Bzpzl2vPw7FD+lmNo3qH4CkNCb
ziI2ZFThf5t7lzMf6TCPdk2mp5Evgd2To5UOC0IH8Q51WQUmjcCSLD2vMn387NmS
9lS6iyKzLjb7DHp8TCuZniChipbXsK8+Ip2VEKerIYJ6hWMIkc+UNEspDqk+nF/6
XgKlqZeOtK5lIalGG7vRZ/hMyaxajnyIrXy7cDUhI5yHJTqir4k=
=VTHR
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIdKYIACgkQ9DSh76/u
rqPtRw/9Greh3cXfOt8fAM38kCDKcZTc3rU2IncrLbBzkwxGm6PnKgXPIEkg4794
ljk169/7tHB6M70s2V5XGiG2gtlLJLRNod/lXHkftDez6NAKKYuoGDeTjgzhRjX/
K5N7fCARbX4JK8wu910BTjwmCGvo7Gc6k1+sD4HfRBm+CeXMj31uQ4Oh5K0nLm51
xdqNdVfKdnQuA2io+kHe2uuSPuy2a2vKvf5NcFjKK2T+Nr5RJuJV0ajS09sC3sGG
w0yuZY5+jUk2HNNJeRHHO4VnKx7GCYzmwzyajFR3b1LYkzg0sWefMVgWjEREbRZ9
6p0Y4KRmsGZjWAoYkQAi90wsoWQbXCKiXmDNJyw7BEDQyKDdxTZ/JnJLwkfeJV2B
wniuBxCA36Azr4wdRgGMP9FuBurEaB1+KxUhmmCFUMrx7N/ZgSZ0AKwjdkIhLz9d
NHdbsqP0Mu931uXTLasXcq2NqqVFglHFgkrLrnj+dW9NOprUFbf1mrjr65toTwnr
unt4FxSTBuC4FErwGsNlSwNDZMDhNbpNaHHq3jqIj6HODiZ0NcyAOSxVisgyo4bS
uwvkz6OoLFW77nL9j2fJR7DOfLjA8OxvYZv65DMSuDWG8GVNCl0n6AyMaPO27gbK
kRfzr3e4ELGUv2q4NnOOpofJC3puZRp7ZE3p8MNKPsm4+rVW6Ak=
=ZucG
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIo/mwACgkQ9DSh76/u
rqOhAA//dIVvsV7sPQoWuD2kUo0MgKtKl5p2yY+PFj13eMcostGe2Rh/6uUyJlMW
An6SZGP4ncWJckUAA2DPTYH17p/zrPZoPgnyI/b4S5PUtjaEMbwikP5fr2o14M+m
FLEax+JYjydHCOZMhh2YIJ9f/klpWmhKNxlOrDxfgajocw3YuT0Qo31TrmqcxcHT
lf3Ms1NI01Y/++pwTEgWgar5Po0FMHyK+HSEjXIkHwzbBl5lHMRCEmtaojXy9ZLG
WjJRIxjtr+49aMZRK1Z+9wdAXTPwDvMUBpTUSzoPmgEQuNhbsCBbGp+aeKrvabmF
8buY3k37rhadxDnFHHcs6De3aQatQ2+XBT74KN546WOFiq6IkaYKQMSQ2Ekm1k0r
ICLyDVrrufCm+npdbCMCvi1PTwmOwCdC6nNeeAVlbaifT4sDBwFy+WXicaFJLCcK
cpCWkxx7sW3fNwzKMdRNUzaLy8w/uJYEwkK1BYJ+jNCdmw2GxmmV9QpzZ9vaIllU
U3YDH0e+lBDRSrHEHqnz8PnFEYVziwpVzVeIkwK8wrl0YBNeaDRydWaUcFm2pZaj
Z7XkP4pnXnEKSQzLSnKpdpk/i/V5G6Sx52c4SCaimCEgcPRfAVzV6bqq9vlFHAFF
DtC8kRJFt91rSnFHuDoTSSFVUriqhqHdR5p4Doq0tz0kHFLcq8w=
=coZ4
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIdKYMACgkQ9DSh76/u
rqMmpg//QaFMyF2Okhsju/aE2RT4ngn8s4Ngydl10Cv7MIElCAGEEfvU3zAZRoX0
JoRU8WAIIWKyEDsWN/TQwZ4CaQ+1Hff7UVFgn9WOOnChtKs4G0mGhrr1gV6ExOXG
jw8xtJTWE/WIBYlwWkKw6Nq/n4RBgALI4Wh5Ba+jFW8lK2mJDre/ic3xRLeKvdZv
HgZ2DYY0zYKUWyaUCQfKdyniPxLW7bNVWDZ3BhXQ0XDTDthai18ovkRwNXAEGTNf
14OXA5jb/fAenbPewtciw8T8wvSxuQFaOHLrg9Yg8hrWZgaIjIcKG2NIJoB9udU0
jiEEFoko596QBXOff7yad10PKI7fp+3ReL50u5ZCqYn8ETnktP1wZfs1dw7X4Q6H
LUwJ7tLrcDoov62jgKICelAzhVcfPIdaPE/gN4vyz2h5MSk5kh2tI7+JzNKaB9s8
CJ7uOH07V6TjeX6XOygWq9aPHEyxX/OCIuHZJznL3JDVOCgYY4nK5s14l1SBXupW
qXA+qMTPXMjfFRGGT1UcDTGgMmmDNvErN2yys53EjAvIMcTMaWLObixJn7Zutjzl
Aoaq+4Mdy/d9yMoFwxkqiKn25HT6DiU5MAz5PKlVfgu5YXt1CSi9TU9OZe9RJkGk
wsNJ5jrju4vBjQmAT68vV+VMP2/jX9B3I/Otdt23CIU4KjPTxBU=
=vKrk
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIo/m0ACgkQ9DSh76/u
rqOmsA//VkQOQSKkIZOE/Cm5zGEVc6VeiSku0FUGyaOsPvuo9QOzHVHjET9oTbna
QoTtHluQzy5zx0WWsbL5lZWGVYYn1dh6bbWxgiCiQtY7Rn6LpsB10MNKPMNDmTnP
/j7IM4RggrA8Qcw+E4UQ7YNjdWiA9AbxqFybDzNuAuzM1DMQ69IEK+eIAjeZuQpY
hfyAhWvkzvayMNvufLi+LRoii/V9+9wDN/ms4EWeT9SeemHmCNjFOZmCm/an7Cr8
RYB/v3nr9svUqFLDYMcIu0Jxg4CyOwaXb9qMj+6hmiIIcYlB1G3rVwQRzncYrE15
SfFcJ9wqxpMP1HxJo84W8TwYqMnTOf6PtIbMuyC9OAcRJLsMmyXD2wNJ44nx7Xq1
NUZeijaP2+enAbIZHTVfDp9yn7ClyUI45i02r7AO2lvSw0UPI2mbOghPrPFqdO2j
PMA1RraZnfJRWtfPAgosFHMR29oge8Aqp0rm5K3z0a7UHpQ26xi0qIn1XgvBQ/jF
8QPbxwf6vodC3Yyn80KuGazT9ypbw4mHGnj3VErDOrTjQ1BWS5mKl8wKIVgEYm+W
uB9ibQUHgolYSqC5lZPO2zK87LgX46W7m0McrzehfxrVFFTKV+eq8auw32uaOFCw
lWiMwMAuMfykqMwUj0P58tfGwBehoZjjtWSF9Xd3w/0Umj/dmAw=
=1EuA
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 14 10:38:05 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Update to 7.3.2.1
-------------------------------------------------------------------
Wed Mar 9 16:33:59 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Refresh patches:
* 0001-Revert-java-9-changes.patch
* fix_gtk_popover_on_3.20.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com> Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -48,7 +48,7 @@
%endif %endif
%bcond_with firebird %bcond_with firebird
Name: libreoffice Name: libreoffice
Version: 7.3.1.3 Version: 7.3.2.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+