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

- Update to 6.3.0.1:

Browse Source 
* First release of 6.3 series bringing more new features
- Remove merged patch:
  * 0001-Use-sort-on-finds-to-improve-deterministic-build.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=796
This commit is contained in:
Tomáš Chvátal 2019-07-08 11:31:46 +00:00 committed by Git OBS Bridge
parent d8d0249cdb
commit c90272b0ce
17 changed files with 72 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
0001-Use-sort-on-finds-to-improve-deterministic-build.patch
View File

@ -1,81 +0,0 @@
From b264e2f18c08ad9184ff8fa005c090ba2b4f8038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 4 Apr 2019 13:33:26 +0200
Subject: [PATCH] Use sort on finds to improve deterministic build
This should sort out all outputs prior processing them further resulting
in equal output among multiple builds.
Change-Id: Iaf24bbb94eb7b8960177bcf2c3e08d31d2fb7210
---
postprocess/CustomTarget_images.mk | 4 ++--
postprocess/CustomTarget_registry.mk | 2 ++
solenv/gbuild/GeneratedPackage.mk | 2 +-
solenv/gbuild/Module.mk | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 5ad55799e1e1..f1e32f0b28ff 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -96,9 +96,9 @@ $(packimages_DIR)/commandimagelist.ilst :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \
$(FIND) $(SRCDIR)/icon-themes -name "*.png" -o -name "*.svg" | \
- grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | $(SORT) | uniq | \
+ grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | \
sed "s#^#%MODULE%#" | \
- LC_ALL=C $(SORT) > $@.tmp && \
+ LC_ALL=C $(SORT) -u > $@.tmp && \
$(call gb_Helper_replace_if_different_and_touch,$@.tmp,$@))
$(packimages_DIR)/sorted.lst : \
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index e84c35eec7e5..a2560f2e2d74 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -597,6 +597,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Helper_abbreviate_dirs,\
$(FIND) $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) \
-name *.xcu -size +0c \
+ | LC_ALL=C $(SORT) \
| $(gb_AWK) 'BEGIN{print "<list>"} \
{print "<filename>"$$0"</filename>"} \
END {print "</list>"}' > $@ \
@@ -612,6 +613,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
$(call gb_XcuResTarget_get_target,updchk/$*/))\
-name *.xcu \
+ | LC_ALL=C $(SORT) \
| $(gb_AWK) 'BEGIN{print "<list>"} \
{print "<filename>"$$0"</filename>"} \
END {print "</list>"}' > $@ \
diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk
index 25af209b857e..05bbcf43a93e 100644
--- a/solenv/gbuild/GeneratedPackage.mk
+++ b/solenv/gbuild/GeneratedPackage.mk
@@ -42,7 +42,7 @@ $(call gb_GeneratedPackage_get_target,%) :
$(foreach pair,$(PACKAGE_DIRS),&& cp -R $(PACKAGE_SOURCEDIR)/$(call gb_GeneratedPackage__get_srcdir,$(pair)) $(call gb_GeneratedPackage__get_destdir,$(pair))) \
)
$(call gb_Helper_abbreviate_dirs,\
- $(FIND) $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) \( -type f -o -type l \) -print > $@ \
+ $(FIND) $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) \( -type f -o -type l \) -print | LC_ALL=C $(SORT) > $@ \
)
.PHONY : $(call gb_GeneratedPackage_get_clean_target,%)
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 8b74a425bb2e..52798fd40731 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -235,7 +235,7 @@ $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize propex ulfex xrmex tr
$(call gb_Output_announce,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),$(true),POT,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) $(SRCDIR) $(dir $@)/pot \
- && $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e "s/\.pot/.po/" > $(dir $@)/LIST \
+ && $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e "s/\.pot/.po/" | LC_ALL=C $(SORT) > $(dir $@)/LIST \
&& touch $@)
# enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]
--
2.21.0

3
libreoffice-6.2.5.2.tar.xz
View File

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl0Tvh0ACgkQ9DSh76/u
rqOgFQ//W5x8+4Da69DYb3yiGAY2YUj5GEFCtNG9KmRvGBrOL9jyruf/AVZfrWoX
K12wiI5N1F/c3BbcBUnSovp+vZJBQv6VhyCp+nHrr34XRHUDRpJlOqSBFTL05Qvl
EelckcesnmN80S8xSzL7n7vCvkKNEV7iJj7kiYtPk6p2uXfPZsTBBUFsTKIYZeoe
r2QHqmxkmTZDLG76tkls2ENxtZhvhkqpmroBdaAguRw7g+ZMWkunE2d6j35gLZi8
uQQ5dLPhhei+q/9Br3YpwkmF4JQCVICtTkpdP8Omi/UUNmc6hEPvHQKoRwnJWhc7
FL335lcc+Krt5hZaxSeAHeFuKnLxJmOZ1TLYBy7UH+1WQrZGsFuKsP0YdRuoE7AC
cIDv7whT/+Qo+VQcZ0PoqbBqP+DTTcrxzpWtK8TCeqLgHllHZLYn56g98/X9AQjw
WDxgjbKiCJkExb1Skh4Pdc2tiFb/749fY2Ga3apvnypqHK+o0Sn7pyHWmcQUA9U+
MTWwj6MkrNn6hKqd3pWRH60rj4mWBMoWyBun5GRZL9XQOjM8l++ykVCD85ui438c
BZBffE9npJkg/K7QSeqfL1BFSgA7FocvQRvskw2VufLAxNSp63j/mh4t/YFAMzEf
2RQhI0BTszs/U+rNCxsxZS0bUzrgY0bZMavpBXUqpmB1KL9ibsU=
=Rb+L
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl0fPj0ACgkQ9DSh76/u
rqN2Ug//R66voo7+PEFoupb+uZrn2YEP4yw0aa5p8zMYO3Tq9rLyLOr0Zczbpsk3
61qwwxYiIkPsT7ImTCRPGZZrIYp9rGxdIaPNuRX99uWHjaxvX8A4to1R+Geag9Rf
8u4hbM3XTpMlgabcRfmw1Y5vobNsuLaHncv00ddLloyPl1S5ricMY3ndEmLOsA5x
dXAf8l+yS7bESVNIeLdqrnhY7hlbpcI/G20bvOwsEMxfBBIWJUAYw8qvhHI0Xup4
qAj6z4vQszCZrfKNkZKYTU9WRHdSZqgKXUODqr7l5iDudPBezSKGHpx0fIjlqJDc
SL71VPdbGKSkmeuxkumuW4DQNYbBYmspExEff2qQut1tOXKteNPIADRYP99OuQsb
fcLCfIzMPyeSSUjXBjKcAm9N0Vdf7UWDTUm0zjEqhjJSkz0hNFVPZpoQtsgwXwGY
HIopNS7QCnqqbuqNBpfVI7Wkd/9g456PIQEGJDSWfYCsu1hdBR0v+3jnDjK2nOlU
1TBemPg51b6XOFE7VsquxbHAS1do85kutQKIPVeKhgWaqIuf/lh4f692E3qBxduj
oXGnnSpceA2HHbswwdWSdeAg/7XSAXlnqaHzFLfky/6Xlpm6Dv3g3Y6Oh7VKtASm
tbHH1IpE8J1pvszmUcjKobNCaWdh87UB2aWNBWVor779qoWyKTQ=
=n1rF
-----END PGP SIGNATURE-----

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

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl0TviEACgkQ9DSh76/u
rqPpJxAAxC3KWsd17NPSkVtHIW56fkKwv40xLgmk8mDBV9LkfFWIS+geVS8CSK1c
LyygmNszIFOHfBaDXqCDBDLO4eGl4qgBb0wuz4fYk2Kh225SAshopdvqKaCjeP75
efBOkpHj0gDpbZjkxArd2xzqMqDHC/YuqReh0DONy9ZABdHvu8LcioNeRaGNl0jJ
gYBOeP3P/NzHW2aCS7CkUAkIzBWO/klJqM1U5Ty//lyG7RIN8viYitbp8zXisn88
sqtwqu2YT06ggEQgw+0PWDQsWZAJNCVMILu+bWbssHQXfWCdFTXh7MWv9kW5Jfqd
AEdtPyRBexHnlx3MBneKz+WsZsjuoEjsTyH9fTuFz4b3Xqy3FYPb7NqX4G4LrAXL
4hGVSKDrNKrf6fbEwgzjgKnkRVxma1+O5qiKDflhlhd1QZwCVyP1sBoF6H3JXT7j
UBCZzvYqk3atSrOf3kNXmoY+EIffbmA8V+ePwBEHw3WM0tZlPbpRsFMTHe2DXnZ4
OcCV+q5+Fr0fS0RKEUwx2vG+NeUgooPzQy6WAVD93Glbpe+jtb7HOd6lebvb8s3i
b8TsKA26oYxclGcWfM1mqe2tJXSnpMUCYO10f8wtXwCG6A5Sw9EP9wnRZl2nGiQy
tB4cExCqBtEsGRaIwoRAobiIwPJhML7Qh+NU774JcfmeiLAYjYA=
=994f
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl0fPkEACgkQ9DSh76/u
rqOKRhAAk/oqmQZ5+93h/2vieHlVRQwb9kOjtj6hkrp3TtcSxKhYZE7T+U5a1jec
VmValslQLrvFtPtIN8/io8HD8duMN5rPEvnpn9co9GANetUZGLeY6emNtQBNeyoq
0VY7qsL06Fkly1IVAa4P8ckOAGiDT4nwvj29xievmsdyvKtb8cf3SvV8xzjuJMow
CpY1d5+i/XWH+2mAqCNNPIeWmabm/HL8cJcpK6aCY90TyL+/+37/4Hdw//ZqT2dm
Kr0+n/++zmLToY6Qdcq5SfF+tGrBO9cmmXvWJyrEotgWNnF+F6wk0Tkg/9O07VI4
hZh4v3GzSQit6Vk2obU0z3c0uoYHRIr/qpnZwmzlkAGioTe17YrpqUjacAqtnx/5
xmQPaIYaYIJ2VL3NODAs3/SuVEe3w006g//omLI95+PYJBr7IpscolaXxca8q+ly
EIijSDKp33WuBu2OeUvULi1/9RqUKXIis4wHlLjwoDCjmjan2Qsw0C2s472+uLIi
n1BwvKJzXwmckJoHZMunZNqvZ2srXES8XaZF+laADjYIa5khtYmwG096zQGZR1gw
ZIrCcy+cvwMIw44sNdt++298Owv0VBc7pE4zn+ooyslrqlB2BBCl6BWC/AVgu6hA
hDltYi74VdPPJ65Eg5K/BBPw/HNEJZnCXI5HGn73X4c0wPo3g7U=
=QBFG
-----END PGP SIGNATURE-----

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

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl0TviIACgkQ9DSh76/u
rqNYXBAAi3M51dyQGO3URGlw890KR/92MJ8S95INQVW9W1NFZyJ30fG5kCy6QJGE
GBJoobbuSCFcC1fcBE1W+K8ZtIh5eD1ehSg5/LKMPCl6LONZtLReroanNopTW8Ha
05HlgW0g1L6XAaCqy5s8pkPtqk6pvjZqmK52/PrRqzYxOW5IUx7kGJrYp4mmmErQ
pUYIwz7Dc5j+Fu/ioNNf+qRmYgVXCcKP2EtoxR/lcsE6dIm+f4RhTvC/56uRa7bE
JVs4cXuQ5dlbh+/3TsJi6mmsDs8C4Z+KW63l6cWQ/+o3IvUZq8GI34Pu2MXbjn/f
uEXkLNFzmUlczBfKtGoKkPOK8r9zR1uWOLDTDM3oqDZpK6eagVOCoQf4ipN5k4cv
kOEPTgNkvDYdrvCwwuOsvkyIIun3Pbugd+HwTbtrG6Xke59/sAi92rAOxBpsdoaQ
X+f3B18fdRNSI4Jv8GcCsMShd3No0jd2TMu8hrXs8feMt3Gh1RcrKedEWqEnByIt
cTR2fedP4plmgE5R12AYI2AwJt9rCuAOUVWKrmGux+aB+suHQJgWdlWRQAkiyvlG
pr0Y+M4Ni/TrP4wUOf/1TpiFkuXD4caT+CpfNGDrKSU2+R26tuzWpdboU67JtQzP
oyfdlKjmCbwDESJsqUj8pyXCSWsHeZICe5v6wyrWdifJ5eVDyXo=
=5DGN
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl0fPkEACgkQ9DSh76/u
rqPmlA/+Owm6/a61PksLfumo8O5qY1FCQGAWhJ1xIebFusZKKRh34sI2cJqy105X
ofZvKZByJw6ukQMYbKIBWx1WZGjXvaLlXsREadax4nRhrBspLZcnDOjf6/FQ7ijJ
2G9ZrhB5CHiIu/ErZTpwCHb8Udsae0BhooV+k0OpI7vEfyquNsHtu6lbZreR5q1G
L+mA00JlK/rfGIgiS5L5ds4YxI8t700GVFEcnp5i/mvFryEu65mLQL+Uy18puh1g
NxhIBPjiFudQKxy0lE6VxlDe53WodhaukapElwvianz/AviQquqyWjLMSEdXOA2x
ouq59oPX0UlM+dCFgztEthxJzmQx0qvPOSbjnpAvyGAFt2/ACQjiehEZawN+ynxL
2QuNv8qTqBCT0qFsjN0dzzx9Y4W61sqdLWi7Z8hFk6Mqk5KO5M7vQTdpf66tx7KR
obyezdinC1zc5jfm1O38g0ySlHrY8b1HhkXajidTaKHxxrWcXaGBFy/wSZMZG8Ou
itb6/fbISmDlRkbP68j4qsxDeNxlINxN+bVHK3foeITZY0tYWUpSugaHkaAb+zFF
hjlmqgfbfXdTTCi2GKtiR/x4Ry8o5UxrwFtmlU0tYv4TqitPqww5lod3lBB4qdnp
RU2dXXl5DY/b2Zk2+dAJY0fDEDFdjtmrTuB7fIgRMxMUXPMhwiQ=
=LUdM
-----END PGP SIGNATURE-----

8
libreoffice.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jul 8 10:36:15 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 6.3.0.1:
* First release of 6.3 series bringing more new features
- Remove merged patch:
* 0001-Use-sort-on-finds-to-improve-deterministic-build.patch
-------------------------------------------------------------------
Mon Jul 1 10:29:34 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

10
libreoffice.spec
View File

@ -52,7 +52,7 @@
%bcond_with gtk3
%endif
Name: libreoffice
Version: 6.2.5.2
Version: 6.3.0.1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -92,7 +92,7 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
Source2006: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
# PDFium is bundled everywhere
Source2008: %{external_url}/pdfium-3550.tar.bz2
Source2008: %{external_url}/pdfium-3794.tar.bz2
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build
Patch1: scp2-user-config-suse.diff
@ -100,7 +100,6 @@ Patch1: scp2-user-config-suse.diff
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
Patch12: 0001-Use-sort-on-finds-to-improve-deterministic-build.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep
@ -192,7 +191,7 @@ BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libabw-0.1)
BuildRequires: pkgconfig(libcdr-0.1) >= 0.1
BuildRequires: pkgconfig(libclucene-core)
BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.0
BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.2
BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1
BuildRequires: pkgconfig(libeot) >= 0.01
BuildRequires: pkgconfig(libepubgen-0.1)
@ -201,7 +200,7 @@ BuildRequires: pkgconfig(libexttextcat) >= 3.1.1
BuildRequires: pkgconfig(libfreehand-0.1)
BuildRequires: pkgconfig(liblangtag)
BuildRequires: pkgconfig(libmspub-0.1) >= 0.1
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.13
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.15
BuildRequires: pkgconfig(libnumbertext) >= 1.0.5
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4
BuildRequires: pkgconfig(liborcus-0.14)
@ -970,7 +969,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%endif # Leap 42/SLE-12
%patch2
%patch3
%patch12 -p1
%patch990 -p1
%patch991 -p1

3
pdfium-3550.tar.bz2
View File

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

3
pdfium-3794.tar.bz2 Normal file
View File

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