diff --git a/0001-Use-sort-on-finds-to-improve-deterministic-build.patch b/0001-Use-sort-on-finds-to-improve-deterministic-build.patch deleted file mode 100644 index fc45957..0000000 --- a/0001-Use-sort-on-finds-to-improve-deterministic-build.patch +++ /dev/null @@ -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?= -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 ""} \ - {print ""$$0""} \ - END {print ""}' > $@ \ -@@ -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 ""} \ - {print ""$$0""} \ - END {print ""}' > $@ \ -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 - diff --git a/gcc.patch b/gcc.patch new file mode 100644 index 0000000..7d24477 --- /dev/null +++ b/gcc.patch @@ -0,0 +1,33 @@ +From 913120fe50ee770e60bd82e2e60047242872111a Mon Sep 17 00:00:00 2001 +From: Lionel Elie Mamane +Date: Wed, 10 Jul 2019 10:27:19 +0200 +Subject: build failure - disambiguate Calendar return class +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: I892281f85f6cc9c2de2c341ae63240ae85d302c4 +Reviewed-on: https://gerrit.libreoffice.org/76595 +Reviewed-by: Tomáš Chvátal +Reviewed-by: Lionel Elie Mamane +Tested-by: Jenkins +--- + i18npool/source/calendar/calendarImpl.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx +index c9e22f7..228bed3 100644 +--- a/i18npool/source/calendar/calendarImpl.cxx ++++ b/i18npool/source/calendar/calendarImpl.cxx +@@ -128,7 +128,7 @@ CalendarImpl::getLoadedCalendar2() + return xCalendar->getLoadedCalendar2(); + } + +-Calendar SAL_CALL ++::css::i18n::Calendar SAL_CALL + CalendarImpl::getLoadedCalendar() + { + if (!xCalendar.is()) +-- +cgit v1.1 + diff --git a/libreoffice-6.2.5.2.tar.xz b/libreoffice-6.2.5.2.tar.xz deleted file mode 100644 index bf3f3c9..0000000 --- a/libreoffice-6.2.5.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e9c00e9b17ee2d35415c6baafe13d16a891253477b8cecf1942f0035aac358e -size 215008848 diff --git a/libreoffice-6.2.5.2.tar.xz.asc b/libreoffice-6.2.5.2.tar.xz.asc deleted file mode 100644 index 2a5bb43..0000000 --- a/libreoffice-6.2.5.2.tar.xz.asc +++ /dev/null @@ -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----- diff --git a/libreoffice-6.3.0.4.tar.xz b/libreoffice-6.3.0.4.tar.xz new file mode 100644 index 0000000..d7ce438 --- /dev/null +++ b/libreoffice-6.3.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87830107b17fbf6c3831c8e6bf738e7d21fa7826debb88e4948d80caf2a7aed7 +size 224504440 diff --git a/libreoffice-6.3.0.4.tar.xz.asc b/libreoffice-6.3.0.4.tar.xz.asc new file mode 100644 index 0000000..a700e64 --- /dev/null +++ b/libreoffice-6.3.0.4.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1JwoAACgkQ9DSh76/u +rqNt6hAAqKS8z6mHLAHmUm648tFukr8DDfcX8+GfT9qAm78wOdISDgo7quIG4pL6 +NRRYZvWS/YimY59HFdBC9GJbVlPULLOHPWhKEeejky2FjjFwDB/5lTS2sO8/cMBO +/gQX/JZhA//UqWLWBjTXzKeitye53yF0wSLVzFKYu8mQpydpAtFpyMx1Zn8VHpOK +wSxsr8yXjVn0DloIxaHWNm43FOcNNiZEz8QgmizYxfmCzbjNkLYcyUmzylWXG/YL +bYVMk+RyQhu1MASjQn5pxI6W6mP7Eb2ZN+E89GA4MtFHr7sNV1yKA4ur2HpGUy6m +I+mhk3iMMVqyQhLykLSs1FZ0rfEIqY0ZQmNFnXwpQRNPrMDlznxGZHfi2mohXXuQ +UNS2kuWJCqqz5qxvLcLjTJiN2zw9bAs0e4nAqSRMw+VAGtgGOaKEzJJXFrFBWgyF +o6qmb7U66V0sK3lb3lW1BxNXKscrKg3bZZkKFvgE3lxlyZsswm2IhTTkm3X1Zgdl +UTbxo1FOnkqllUt0uKmmjxxL4ybHSSVClL9hJH4ixbGxcIT/aQkxrZPKBT66vp2D +AqtR5GFM54simCkhlRqv7H3EuCIkRPYedRf2u9KsYSveZorAF+r24MCE8HBr+5jM +zXhNtY3U1EYGqHoIqgsHxyJmlnetEmyWuux5AEhRpnVBu3Qnf9g= +=phCq +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-6.2.5.2.tar.xz b/libreoffice-help-6.2.5.2.tar.xz deleted file mode 100644 index 854505a..0000000 --- a/libreoffice-help-6.2.5.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:327f74590f60e9b0a58f5ab54304cdace248c9f1b45fd486a687481b715043d6 -size 13023680 diff --git a/libreoffice-help-6.2.5.2.tar.xz.asc b/libreoffice-help-6.2.5.2.tar.xz.asc deleted file mode 100644 index c1f5a5f..0000000 --- a/libreoffice-help-6.2.5.2.tar.xz.asc +++ /dev/null @@ -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----- diff --git a/libreoffice-help-6.3.0.4.tar.xz b/libreoffice-help-6.3.0.4.tar.xz new file mode 100644 index 0000000..f2b69ad --- /dev/null +++ b/libreoffice-help-6.3.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f5c5dac7e6d4fafe8b7e14d8b67454e4773cd0696be967cef7b97f33fc72bf1 +size 13191436 diff --git a/libreoffice-help-6.3.0.4.tar.xz.asc b/libreoffice-help-6.3.0.4.tar.xz.asc new file mode 100644 index 0000000..896bb2c --- /dev/null +++ b/libreoffice-help-6.3.0.4.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1JwoQACgkQ9DSh76/u +rqOebBAAmNy/uupc/v3BLwIMZw6ZjT6kmi9h+ZAZdJJgTsScf1B0R4pgeV0TNrne +s6qrgCo2A6UL4lirZ6aRx73N7sKtVPCQto0X3pSD+fVhyAgM1s0GMJV82LQQLAxU +Wm1K8tIAAtujdPSBm6yQv87J4qL2O6xiqR+PT6G/DdAJ+dIPX5LRbsQAQr/GGYxp +07BkodDBcM8efbLdY9/FIMx4nGuu7B+XmotRbPMEy49foYKkmSafkS/0xXPKI60R +SoI2w0vCqhWqw7ffMMdyrKDxdsNUfX31bSdZPoZklwGuXYPRemvayf+RIhgUh0ps +bXLbc7DLKsvPHA4TIkPI9N2zHhBkD0EXugKl0lwUPGmABhLvqJbMty0KwTDWazxq +tlijbCBpM7Uf1mr3q7Gknp+Ej3VP+2l1hSIyYxv/cAnevM8LAU53rYf2XyA72lrX +8bKVoBw9lbb+6EHLsbT+mCIqyW5VpvkxKE0sy0wi3EuUbRx5s/0H1aDMGFhI6czc +DxOOkFSCRomgqN98Xsr1wgawUxtc0iqo8j7ROCTncBg4TgsXmG/wonR8x0HKsMfq +CqTChi181/SZmwpdiIYHENZAM4e7qtaD0zqPK4ctB7pphUAFcnWb2h7FUfU1WtR4 +QaZIkYABcO9mW03V5ucz7EFpylx9JACh74r9EpCwGJhBtizIuJ8= +=PY2j +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.2.5.2.tar.xz b/libreoffice-translations-6.2.5.2.tar.xz deleted file mode 100644 index 0e5571e..0000000 --- a/libreoffice-translations-6.2.5.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c39781ef5dc6602393c8cb2f7442c154385e9b89f13fce0e1f4ba600321e9d0a -size 141992032 diff --git a/libreoffice-translations-6.2.5.2.tar.xz.asc b/libreoffice-translations-6.2.5.2.tar.xz.asc deleted file mode 100644 index 4af637f..0000000 --- a/libreoffice-translations-6.2.5.2.tar.xz.asc +++ /dev/null @@ -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----- diff --git a/libreoffice-translations-6.3.0.4.tar.xz b/libreoffice-translations-6.3.0.4.tar.xz new file mode 100644 index 0000000..c648418 --- /dev/null +++ b/libreoffice-translations-6.3.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:090098f72f2c153ee361e9a01f7b2593b0447e93bf4d694a130b803c0577601c +size 146252828 diff --git a/libreoffice-translations-6.3.0.4.tar.xz.asc b/libreoffice-translations-6.3.0.4.tar.xz.asc new file mode 100644 index 0000000..92b2e08 --- /dev/null +++ b/libreoffice-translations-6.3.0.4.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1JwoUACgkQ9DSh76/u +rqPoFQ/9FdehUSphZxeiclnzKXBoF1YEs+hvq+k4sDwUEfE2lJulZAlahJbFAYWP +goMTIwAmHTR3jhaRt4V8sldDFSEo80s9y+GBXjVyEmeorZcr+yEqfy/YIW4JlwpO +25fujPkUcDDnjcgQ57Q9NdgxwgmU7WYd3NsSN7XCjL7gHEs4ubQrkR6h4A2UF72w +kS6XcxL3xZl0dNetMVX0/bu/n8OwJtRR3wiPRePatNBXFGmqgtKBhYUAXJFNbNWy +k1TFnfCgDB+nQRVyskQoE8w36eZwHuqmRhTsJG/gOITvOo/AV9kbqgIPXVg04iP9 +GlJczl7RlH1SiJxMCj+Snva/jvTdvZDJEVSIooVz6ZSc6gUfccY1xxeMm/9TC8JY +NEHrnDwzRlQni/nIsBwctZPcrfMHARUdJVMug3vPglsqy08ZSaVtGwK9UoKG9/E1 +Hvc8JDVe3sPL3vHaxrCoQKcCX9PuhoS1jp7FW7ujiSOf74ShOVY8zAmEum/RuS/u +AOF8AeuqERPOlfzDjuhwZmFKcRv8qu95JtlzQCrH1LWWoqUemxTQsp5Zsh+hQBO8 +bMO+bsuZPg7AhP+cnFFO/JxTli2G5TBBwQVoWYqogGozzWxlBxboqhTw9DMC6PNx +UGfKvOKdjgQbOrh4FrSRf9r4wvEAb4P1TKy+n9brUeBsZxchSY0= +=wxx2 +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index fbc8dc4..2ae5487 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,7 +1,42 @@ +------------------------------------------------------------------- +Thu Aug 8 08:23:33 UTC 2019 - Tomáš Chvátal + +- Update to 6.3.0.4: + * 6.3 RC4 +- Make librelogo standalone subpkg bsc#1144522 + +------------------------------------------------------------------- +Thu Aug 1 15:03:55 UTC 2019 - Tomáš Chvátal + +- Update to 6.3.0.3: + * 6.3 RC3 + +------------------------------------------------------------------- +Wed Jul 31 11:31:01 UTC 2019 - Tomáš Chvátal + +- Add patch to fix building on older openSUSE releases: + * gcc.patch + +------------------------------------------------------------------- +Fri Jul 19 08:19:37 UTC 2019 - Tomáš Chvátal + +- Update to 6.3.0.2: + * RC2 of 6.3 release + * Contains partial fixes for bsc#1061210 later split to two + independent bugs + +------------------------------------------------------------------- +Mon Jul 8 10:36:15 UTC 2019 - Tomáš Chvátal + +- 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 -- Update to 6.2.5.2: +- Update to 6.2.5.2 bsc#1141862 CVE-2019-9848 bsc#1141861 CVE-2019-9849: * Various bugfixes on the 6.2 branch - Remove merged patches: * bsc1124869.patch diff --git a/libreoffice.spec b/libreoffice.spec index c9d3341..e9ae119 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -52,7 +52,7 @@ %bcond_with gtk3 %endif Name: libreoffice -Version: 6.2.5.2 +Version: 6.3.0.4 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,7 @@ 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 +Patch4: gcc.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 @@ -124,10 +124,10 @@ BuildRequires: flex BuildRequires: flute BuildRequires: fontforge BuildRequires: glm-devel -BuildRequires: graphviz # Needed for tests BuildRequires: google-carlito-fonts BuildRequires: gperf >= 3.0.0 +BuildRequires: graphviz BuildRequires: hyphen-devel # genbrk binary is required BuildRequires: icu @@ -142,11 +142,6 @@ BuildRequires: libformula BuildRequires: libjpeg-devel BuildRequires: liblayout BuildRequires: libloader -%if 0%{?suse_version} >= 1500 -BuildRequires: libmariadb-devel -%else -BuildRequires: libmysqlclient-devel -%endif BuildRequires: librepository BuildRequires: libserializer BuildRequires: libtool @@ -192,7 +187,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 +196,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) @@ -258,6 +253,11 @@ Obsoletes: %{name}-icon-theme-crystal < %{version} Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} ExclusiveArch: aarch64 %{ix86} x86_64 +%if 0%{?suse_version} >= 1500 +BuildRequires: libmariadb-devel +%else +BuildRequires: libmysqlclient-devel +%endif %if %{?suse_version} >= 1500 BuildRequires: gcc >= 7 BuildRequires: gcc-c++ >= 7 @@ -404,8 +404,8 @@ Summary: LibreOffice Base Group: Productivity/Office/Suite Requires: %{name} = %{version} Requires: pentaho-reporting-flow-engine -Obsoletes: %{name}-base-drivers-mysql Supplements: %{name} +Obsoletes: %{name}-base-drivers-mysql # default database connector %if %{with firebird} Requires: %{name}-base-drivers-firebird @@ -536,6 +536,17 @@ it. For example, it is used for the mail merge functionality. You can find the more information at http://udk.openoffice.org/python/python-bridge.html +%package librelogo +Summary: LibreLogo scripting language +Group: Productivity/Office/Suite +Requires: %{name}-pyuno = %{version} +Requires: %{name}-writer = %{version} + +%description librelogo +Enables LibreLogo scripting in Writer. LibreLogo is a Logo-like +programming language with interactive vectorgraphics for education and +DTP. + %package gnome Summary: GNOME Extensions for LibreOffice Group: Productivity/Office/Suite @@ -548,9 +559,9 @@ This package contains some GNOME extensions and GTK2 interface for LibreOffice. Summary: Gtk3 interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name}-gnome = %{version} -Supplements: packageand(libreoffice:gnome-session) -Supplements: packageand(libreoffice:mate-session-manager) -Supplements: packageand(libreoffice:xfce4-session) +Supplements: (libreoffice and gnome-session) +Supplements: (libreoffice and mate-session-manager) +Supplements: (libreoffice and xfce4-session) %description gtk3 This package contains Gtk3 interface rendering option for LibreOffice. @@ -562,11 +573,11 @@ Recommends: %{name}-gnome = %{version} Conflicts: %{name}-gnome < %{version} # We are default if gtk3 is not present %if !%{with gtk3} -Supplements: packageand(libreoffice:gnome-session) +Supplements: (libreoffice and gnome-session) %endif # Without kde integration we provide gtk2 interface there %if !%{with kdeintegration} -Supplements: packageand(libreoffice:plasma5-workspace) +Supplements: (libreoffice and plasma5-workspace) %endif %description gtk2 @@ -576,7 +587,7 @@ This package contains Gtk2 interface rendering option for LibreOffice. Summary: Qt5/KDE Frameworks interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name} = %{version} -Supplements: packageand(libreoffice:plasma5-workspace) +Supplements: (libreoffice and plasma5-workspace) Provides: %{name}-kde4 = %{version} Obsoletes: %{name}-kde4 < %{version} @@ -970,7 +981,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %endif # Leap 42/SLE-12 %patch2 %patch3 -%patch12 -p1 +%patch4 -p1 %patch990 -p1 %patch991 -p1 @@ -987,6 +998,8 @@ sed -i -e /CppunitTest_sw_rtfimport/d sw/Module_sw.mk sed -i -e /CppunitTest_sw_uiwriter/d sw/Module_sw.mk # The gpg files are not loaded properly sed -i -e /CPPUNIT_TEST\(testODFEncryptedGPG\)/d xmlsecurity/qa/unit/signing/signing.cxx +# breaks on LTO https://bugs.documentfoundation.org/show_bug.cgi?id=126442 +sed -i -e /CppunitTest_sw_apitests/d sw/Module_sw.mk %if 0%{?suse_version} < 1500 # Header-only libboost_system is not available @@ -1021,7 +1034,7 @@ export CXX=g++-7 %endif # Fake the epoch stuff in generated zip files -export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) +export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%%s) # Colada does not have .pc file and configure creator was really lazy export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser' @@ -1495,6 +1508,12 @@ exit 0 %files -f file-lists/mailmerge_list.txt mailmerge %files -f file-lists/pyuno_list.txt pyuno +%exclude %{_libdir}/libreoffice/share/Scripts/python/LibreLogo +%exclude %{_libdir}/libreoffice/share/registry/librelogo.xcd + +%files librelogo +%{_libdir}/libreoffice/share/registry/librelogo.xcd +%{_libdir}/libreoffice/share/Scripts/python/LibreLogo %files -f file-lists/gnome_list.txt gnome @@ -1508,6 +1527,9 @@ exit 0 %if %{with kdeintegration} %files -f file-lists/kde4_list.txt qt5 +%{_libdir}/libreoffice/program/libkde5be1lo.so +%{_libdir}/libreoffice/program/libvclplug_kde5lo.so +%{_libdir}/libreoffice/program/libvclplug_qt5lo.so %endif %files -f file-lists/officebean_list.txt officebean @@ -1536,6 +1558,7 @@ exit 0 %{_datadir}/%{name}/share/config/images_karasa_jaga.zip %{_datadir}/%{name}/share/config/images_sifr.zip %{_datadir}/%{name}/share/config/images_sifr_dark.zip +%{_datadir}/%{name}/share/config/images_sifr_svg.zip %{_datadir}/%{name}/share/config/images_tango.zip %{_datadir}/%{name}/share/config/images_helpimg.zip %{_datadir}/%{name}/share/config/images_breeze_svg.zip diff --git a/pdfium-3550.tar.bz2 b/pdfium-3550.tar.bz2 deleted file mode 100644 index 4ed285d..0000000 --- a/pdfium-3550.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679 -size 6923846 diff --git a/pdfium-3794.tar.bz2 b/pdfium-3794.tar.bz2 new file mode 100644 index 0000000..7c7f382 --- /dev/null +++ b/pdfium-3794.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4 +size 7123074