- Update to 6.4.1.1:

* 6.4.1 RC1 release
- Remove merged patch:
  * lo-Fix-build-with-poppler-0.83.patch

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

libreoffice-6.4.0.3.tar.xz

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

libreoffice-6.4.0.3.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4o5SQACgkQ9DSh76/u
-rqPYCRAA0e3ezNAA43x0ZjTau5wb7GVmfv7Sgttz+Vjbi9pjH8YWjJl5IAaaARTR
-1qHABNcXEfNs5KUqmFo6YD215fiLraQqJ5ChR+nUbG2KN/YOt+H2u+NaaFZhcZj5
-BluD4N+Vyi5SHKdgTSQ8p+RVD2mewt4k1AYMBiyIeJhtECsqlGJJCPucA0/Gh16P
-I4eEI1lPH4pN7lxUKTwDRucDKmcEoXmtecj1NtQBP65iEQqmWH/dt/P9S0VLTaQs
-KrePKT0Xv0cXED87/dgg/4QZlZhjRixBOuzlfPdCT+c6DKG7kumk5CRWIS8JRQ17
-VwrTEpuvG7moyAtvblTzcBOfIurfoopICwKzyl/1zpejudb+z2ftDjj16+uPWaD4
-/668hb7P2kN35RB6FWVN3u76m0ZXR1rAIEdpCn9u3bKvNwwQZ/Pt1VRB0jP0l80C
-mrfKEPB+udXWGhlg6lJaRPPvlMApH61ra/z2QIdtrRV0edcuGrpC3rI0zN1NzmnI
-C0vyQXPhiziW6rdnih9g7+KMVwsOXdpzx2Wx++XX0reAilD4Ky/OK8jM0xG9brQI
-Vs1FMoJeSqts3iZrz4xqZJzgw65vQYg/YfdF6ITBa56W5/XjR4tmF2+EhCwU6i/e
-LGEgAsUerw9Z24AW6zEZ1bnjcLGEJdQ8DXomgGpqHyB+MoMdzKs=
-=rqhO
------END PGP SIGNATURE-----

libreoffice-6.4.1.1.tar.xz

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

libreoffice-6.4.1.1.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl47AmEACgkQ9DSh76/u
+rqOCahAAgzZPYDTNaXpTDVKb+/4CRi1BjLEbCkHDxdfP6KFAPAFpV5IzBZOj/y37
+QIV1ZJF/2pr6mfmKbwh068siLx+jvo6neFyV9G2sbHXVfxXLt3qz3hMAr2Cm91UV
+wJhkFV+r2m2ZL4+dcj88gZbl4Ph04+u95QMxEcCf1qQWS0egoKwpOeE6Daj/BnYT
+U8OR/rKoDZWNFAfrsL3x564twKQ8FvCoFFUi8HWSXKBh2tZB7HUNKilt3j94DTzm
+7AzXcFz9AENwpeVcJ1cGZ/mKyr+C2ILwkUT5eF688onGmrvRh14ZjUR8+BqA0OwA
+K9026Ah8koN9qedhH+tYCmnBiT2z2uRE5qqzf+cvxPsX1Qfa/B02Dey93Q1fivR/
+JKpshUZSzhwMpwMHkLZ2kryYB4D+rOGTuTq3huLToueJj3NehL8Jrdy2NALzVqmI
+z7G3TOwfk9Nk5T2rF6k2gI+nhFScbEbfRA/5kyTWf1vuJk6UHA1MlHwDBNNvhT2Z
+Z8cG9JUVYgSO6ncJ0iqnwyyMhA4L3MRgnzyirdsP1xoTMcMK3PlYHMeiCFo7dVmZ
+7OoVd9xo7s3awKh/i+pyviSZZkUSGadGix0rW953MTiK0McvWHDiu+23W4540rEt
+EqwakWTRmRoXqdxIPXNfvLvJanq9lDkIIhQ351n8X4KLqHiL7RQ=
+=9ue1
+-----END PGP SIGNATURE-----

libreoffice-help-6.4.0.3.tar.xz

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

libreoffice-help-6.4.0.3.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4o5SkACgkQ9DSh76/u
-rqPQIBAAsOa7EXZWcPQW28r7y0lLEJttAJ6/eiJEVnnKbMPrQnNgH+pFJXDhBY0x
-sD6oZ0yTur+CM/0Ha0zD4jgtMy0ZpsiH6A/xINCtrUCtSbBd/TcmvDj0C6j2yZ8N
-103G4BmLJxKKDmha4SY8iDiDWkXZ5RcSY5P9XZL29qW9J4XEw62tqaGKOzPZyPpZ
-AhXhrTBnpSMU+zaVb85F7RPncbvsRJNidl3zCmmcDb8NVpJWdMsGNuTsoQDQ2+sv
-PTqy2hMIs+1Yt204kYhRT6OWnRB4F+/b3qB1aYzyDlBLuKMcvgU1iVFNZk0OthS9
-ZCtHyCJODypvRD00/G2KnoyJtxAtLVszwsQf0btmszWc5OLHoWP0MXU23pJYKZsl
-1tDTbslsWGQ81NQScUKohAMSwaaTlm0JtJbQpZ7gkzh87oF58SYK6x2oxEUO+mv4
-2PRPdhNw0xdunGXXQ2eVPtUYoeOwSHpZyjNOp28vdiiFHg3uOokkq2j4fw/AUZPv
-110a75E9u3D+Y3DYgpwg24hWKMrZ8nKUpgBF5+MZCbaJe1eynnNd7C7sTe80hARw
-BaM69YtwACTT9/2gcliL5pieSazXiu8Ex1MCfKc60lPrqGvXfCu8uNm3jwlvoaJd
-MjGqM6xs6Vl0GpqQXddanEtqs2cMTP7W5BEDRYpgQPP/YtGEves=
-=73O1
------END PGP SIGNATURE-----

libreoffice-help-6.4.1.1.tar.xz

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

libreoffice-help-6.4.1.1.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl47AmgACgkQ9DSh76/u
+rqObkw//WyiQwbCp010k3qFKTyjfeIIP7B82Z7JjN8vATRy3yxloRoUxues66VA5
+brZb77VUgqSz5/gRgQQIXdSxt6sk4Vfqw6rRHfuYB6pDunqXYJMRz5nEmDoy718L
+l32wzkWojWWXiEB/gW9dXnRH/twEncFWu0IGhctBpHen77OWZTyQdmgvdG9We14N
+jdIeCoMksPsfkSUUYiZgBbBdWw/Abfr3ZLIcyE2IY9QBWQpctpsnzG1dNuXxWSSg
+EpcU900gBVs6ZN87dI9vM8/QtajlBP2tyBQYUAYX2NwSlHDHI7ITUj2jcBEKBldB
+uZPCi61yACpSjOTBelFJAZ1suirmatbqW+KFo1m7Az7Zo9oKwzn8hAifnLce5Rv5
+WCShzLo3bClJv6Ljt31Y04uW7mkwGltF0lLgz5EAn9uZ6jN2gHrl6qqWdg70sykV
+CZZJmSrBHMdmIFMfWa+WWgHnydfLCSqzi2Wt3WjEr8LwXPMfUIWpxbECNnzUrEAl
+Kbj/dNlvPG2fgNByt19qAcmJitxkI9UotlH7PdDgM4oUVvQqz68yu8bO3UBws3dV
+vE9pEUjzq5DddW8bQRFEoxc46KZXhbTEBh9igOiijIPp8sbNzTxG2JbMPdP9h3Oo
+QNSvy4zC9ySEirDDY11HLa/YVhScrMqzaswMNSmEYJCKVEpvx1w=
+=Z/Ta
+-----END PGP SIGNATURE-----

libreoffice-translations-6.4.0.3.tar.xz

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

libreoffice-translations-6.4.0.3.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4o5SsACgkQ9DSh76/u
-rqNqng//cV+XeoTX9PXnqwwPQxZKayS5CyNJBb4BbuxCRni+GtSW9rGoWRzeTzJB
-o4cscHafD/kqsm/Pr5yO7k20FFNB39KfV1bWNTPVpBbuHGmUoelZOQOrtcZo0sKg
-LtLm32lSKsMiARJP1tINAbnFvzxf9aap/NQPvWyDoKG0v/BT05+3kK6kehz5dE96
-m/uiX44Dcrx3Kkc1/EqYc1cYOxb9XJloxcxGNotkWII335KaTSGwbHY2atCeh4JL
-Y7pinktW9yrMefbDwZvtEIWjhIKOK+u/RlAfBPFresdpw0TUofd/C7hj2I1k5bQz
-MhCmnCjTyOV6Rw/hCvwlkOE1rSfb3f5KzakeT6ZrFF0+22x5SGgrlJj2kFUiOrAd
-PBbmplGCRNmkIkb3HOmSas+jt+Kl7+776DwgDE2LO4j6zgLby2BIElPKCXGJmuqn
-O2g3qEVlzxvOxDs6JbhLiNcObLgAdAMvTh6eIKq0jmHuHvlEg0xpBuKtysFAhHki
-QU+yVQKZj2/a5hHFD/bhCtF1RK+AvMY147AGWpyp/4V8L6/LpsYyAT3+Ht6STVpy
-13ZljRXWQ06j6PPYBAJcC8ySEL15JLrIf/IRTW8pgU+AmbWWRkcl/jIkM4PPMMP5
-EjA2SW70lMqSfrgpKoMMFK3saXaG2O08gYqyC5vogha/6C52AiE=
-=Uea+
------END PGP SIGNATURE-----

libreoffice-translations-6.4.1.1.tar.xz

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

libreoffice-translations-6.4.1.1.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl47AmkACgkQ9DSh76/u
+rqPZQhAAkHCoMYQmqAPUXlroUf+eFQuS8SHnn11lAUyFHJZc8JohHb9/NyepWsV3
+ez6lY7p/XnWrGsSN1xpmxgjw1a9MSVzY8AL3iAnEj2dV1L22oA2hgPhpwv7tqYYd
+KVT8z3ftwN2cZAb0beoZ4d8+LQxslRutsJA4R9z1exxx4TJoA0CI1JVZyYQvCknN
+Nld0UN3yMXBORivyW/0lLXxoq35XABJZfrVqSB9YdgXXsJDi2TxBBNmd+kmTMSlK
+hiaxQDAXI96mtmsERzV2cOkieKc6Oi9wrUfBTG0LRGKfa7S7ulFwtgXJlyu8Bk4w
+0W6kJDO5k/pHKTtJkKBKmWC6B6xM6LvNWypMWxBbqZ6z0jvlsweCzB5SYQZvsZPn
+Jc7WI0uBk+zDY6GVCuFQWBsvlT+MrzIg4Sf4jwl9TTlEeAS6R3uOs5xOBZ5iFbL5
+qhEMUBtafC9Uc++0Twyp1NzwpgyT4YhV9GOcbuYqrH9PPDPZY/ZOfCYyQTCtcVD7
+aHuM8+y670tY2gI0komHHYrwZUwBwnEe4z/Cjz2KTWVM2msS02IDSSqdzvxZL8Bh
+m2gXuux90Wn58Ex5fyRIcct2CffpffchDBm3xUQXO2LZOrkucexcabOC2QRnghec
+C5mZFsrJ0n4jolCWL8MAUI86BXPICuuTC1IVPsFIC8LcQwBGFy0=
+=ICIL
+-----END PGP SIGNATURE-----

libreoffice.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Feb 17 08:03:45 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 6.4.1.1:
+  * 6.4.1 RC1 release
+- Remove merged patch:
+  * lo-Fix-build-with-poppler-0.83.patch
+
 -------------------------------------------------------------------
 Wed Feb 12 11:03:39 UTC 2020 - Marina Latini <marina.latini@suse.com>
 

libreoffice.spec

@@ -50,7 +50,7 @@
 %bcond_with system_gpgme
 %endif
 Name:           libreoffice
-Version:        6.4.0.3
+Version:        6.4.1.1
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        LGPL-3.0-or-later AND MPL-2.0+
@@ -98,8 +98,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
-# PATCH-FIX-UPSTREAM lo-Fix-build-with-poppler-0.83.patch
-Patch4:         lo-Fix-build-with-poppler-0.83.patch
 # PATCH-FIX-UPSTREAM soffice.sh_Avoid-exporting-empty-LC_ALL.patch
 Patch5:         soffice.sh_Avoid-exporting-empty-LC_ALL.patch
 # try to save space by using hardlinks
@@ -957,7 +955,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %endif # Leap 42/SLE-12
 %patch2
 %patch3
-%patch4 -p1
 %patch5 -p1
 %patch990 -p1
 %patch991 -p1

lo-Fix-build-with-poppler-0.83.patch

@@ -1,71 +0,0 @@
-From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001
-From: Martin Milata <martin@martinmilata.cz>
-Date: Wed, 4 Dec 2019 02:37:40 +0100
-Subject: [PATCH] Fix build with poppler-0.83
-
-Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9
-Reviewed-on: https://gerrit.libreoffice.org/84384
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <michael.stahl@cib.de>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx    | 4 ++++
- 3 files changed, 15 insertions(+)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 26048177e87d..e9c2a407c279 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
-     gfree(pBuf);
- }
- 
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+void PDFOutDev::printPath( const GfxPath* pPath )
-+#else
- void PDFOutDev::printPath( GfxPath* pPath )
-+#endif
- {
-     int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
-     for( int i=0; i<nSubPaths; i++ )
-     {
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+        const
-+#endif
-         GfxSubpath* pSub  = pPath->getSubpath( i );
-         const int nPoints = pSub->getNumPoints();
- 
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index 02f6b59f6f15..2e7d2186f9a1 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -149,7 +149,11 @@ namespace pdfi
- 
-         int  parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
-         void writeFontFile( GfxFont* gfxFont ) const;
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+        static void printPath( const GfxPath* pPath );
-+#else
-         static void printPath( GfxPath* pPath );
-+#endif
- 
-     public:
-         explicit PDFOutDev( PDFDoc* pDoc );
-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-index 42178b650cdd..b1a54bd09c5f 100644
---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-@@ -68,7 +68,11 @@ int main(int argc, char **argv)
-     }
- 
-     // read config file
-+#if POPPLER_CHECK_VERSION(0, 83, 0)
-+    globalParams = std::make_unique<GlobalParams>();
-+#else
-     globalParams = new GlobalParams();
-+#endif
-     globalParams->setErrQuiet(true);
- #if defined(_MSC_VER)
-     globalParams->setupBaseFonts(nullptr);
-