Accepting request 1103064 from LibreOffice:Factory

7.6.0.2 OBS-URL: https://build.opensuse.org/request/show/1103064 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=280
2023-08-09 15:24:32 +00:00 · 2023-08-09 15:24:32 +00:00 · cd3e0b3e7f
commit cd3e0b3e7f
parent 6251c5b51d 67c7b4f8bd
34 changed files with 246 additions and 272 deletions
--- a/0002-Revert-Require-HarfBuzz-5.1.0.patch
+++ b/0002-Revert-Require-HarfBuzz-5.1.0.patch
@ -1,21 +1,6 @@
-From 187d3e94f0bd28b63c934bac84ba7c5fb7beb049 Mon Sep 17 00:00:00 2001
-From: Danilo Spinella <oss@danyspin97.org>
-Date: Tue, 14 Mar 2023 16:31:09 +0100
-Subject: [PATCH 2/2] Revert "Require HarfBuzz 5.1.0"
-
-This reverts commit cbdcc18778f9736ca6f186e2bbb9f0db456b1cee.
---
- configure.ac                            |  1 -
- vcl/inc/font/LogicalFontInstance.hxx    |  2 ++
- vcl/source/font/LogicalFontInstance.cxx | 13 ++++++++++++-
- vcl/source/gdi/CommonSalLayout.cxx      |  9 +++++++--
- 4 files changed, 21 insertions(+), 4 deletions(-)
-
-Index: libreoffice-7.5.3.2/configure.ac
-===================================================================
--- libreoffice-7.5.3.2.orig/configure.ac
-+++ libreoffice-7.5.3.2/configure.ac
-@@ -10848,7 +10848,7 @@ AC_SUBST(SYSTEM_LIBORCUS)
+--- libreoffice-7.6.0.1/configure.ac	2023-08-07 21:28:19.740514309 +0200
+++ libreoffice-7.6.0.1/configure.ac	2023-08-07 21:28:32.847268581 +0200
+@@ -10868,7 +10868,7 @@
 dnl ===================================================================
 dnl HarfBuzz
 dnl ===================================================================
@ -23,12 +8,10 @@ Index: libreoffice-7.5.3.2/configure.ac
 +harfbuzz_required_version=0.93
 
 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"
- GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
-Index: libreoffice-7.5.3.2/vcl/inc/font/LogicalFontInstance.hxx
-===================================================================
--- libreoffice-7.5.3.2.orig/vcl/inc/font/LogicalFontInstance.hxx
-+++ libreoffice-7.5.3.2/vcl/inc/font/LogicalFontInstance.hxx
-@@ -156,8 +156,10 @@ private:
+ HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
+--- libreoffice-7.6.0.1/vcl/inc/font/LogicalFontInstance.hxx	2023-08-07 21:28:16.093823265 +0200
+++ libreoffice-7.6.0.1/vcl/inc/font/LogicalFontInstance.hxx	2023-08-07 21:28:32.847268581 +0200
+@@ -156,8 +156,10 @@
     // The value is initialized and used in NeedOffsetCorrection().
     std::optional<FontFamilyEnum> m_xeFontFamilyEnum;
 
@ -39,11 +22,9 @@ Index: libreoffice-7.5.3.2/vcl/inc/font/LogicalFontInstance.hxx
 };
 
 inline hb_font_t* LogicalFontInstance::GetHbFont()
-Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx
-===================================================================
--- libreoffice-7.5.3.2.orig/vcl/source/font/LogicalFontInstance.cxx
-+++ libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx
-@@ -54,8 +54,10 @@ LogicalFontInstance::~LogicalFontInstanc
+--- libreoffice-7.6.0.1/vcl/source/font/LogicalFontInstance.cxx	2023-08-07 21:28:15.910488707 +0200
+++ libreoffice-7.6.0.1/vcl/source/font/LogicalFontInstance.cxx	2023-08-07 21:31:44.758551351 +0200
+@@ -54,8 +54,10 @@
     if (m_pHbFontUntransformed)
         hb_font_destroy(m_pHbFontUntransformed);
 
@ -54,7 +35,7 @@ Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx
 }
 
 hb_font_t* LogicalFontInstance::InitHbFont()
-@@ -73,10 +75,12 @@ hb_font_t* LogicalFontInstance::InitHbFo
+@@ -73,10 +75,12 @@
     if (!aVariations.empty())
         hb_font_set_variations(pHbFont, aVariations.data(), aVariations.size());
 
@ -67,7 +48,7 @@ Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx
 
     ImplInitHbFont(pHbFont);
 
-@@ -87,6 +91,7 @@ hb_font_t* LogicalFontInstance::GetHbFon
+@@ -87,6 +91,7 @@
 {
     auto* pHbFont = const_cast<LogicalFontInstance*>(this)->GetHbFont();
 
@ -75,7 +56,7 @@ Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx
     if (NeedsArtificialItalic()) // || NeedsArtificialBold()
     {
         if (!m_pHbFontUntransformed)
-@@ -98,7 +103,7 @@ hb_font_t* LogicalFontInstance::GetHbFon
+@@ -98,7 +103,7 @@
         }
         return m_pHbFontUntransformed;
     }
@ -84,7 +65,7 @@ Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx
     return pHbFont;
 }
 
-@@ -254,6 +259,7 @@ bool LogicalFontInstance::NeedsArtificia
+@@ -254,6 +259,7 @@
     return m_aFontSelData.GetItalic() != ITALIC_NONE && m_pFontFace->GetItalic() == ITALIC_NONE;
 }
 
@ -92,34 +73,36 @@ Index: libreoffice-7.5.3.2/vcl/source/font/LogicalFontInstance.cxx
 namespace
 {
 void move_to_func(hb_draw_funcs_t*, void* /*pDrawData*/, hb_draw_state_t*, float to_x, float to_y,
-@@ -288,10 +294,12 @@ void close_path_func(hb_draw_funcs_t*, v
+@@ -288,9 +294,12 @@
     pPoly->clear();
 }
 }
 +#endif
 
- bool LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph,
-                                                        basegfx::B2DPolyPolygon& rPolyPoly) const
+ basegfx::B2DPolyPolygon LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph) const
 {
+    basegfx::B2DPolyPolygon aPolyPoly;
 +#if HB_VERSION_ATLEAST(4, 0, 0)
     if (!m_pHbDrawFuncs)
     {
         m_pHbDrawFuncs = hb_draw_funcs_create();
-@@ -312,6 +320,9 @@ bool LogicalFontInstance::GetGlyphOutlin
-     hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, &rPolyPoly);
+@@ -305,12 +314,12 @@
+         hb_draw_funcs_set_close_path_func(m_pHbDrawFuncs, close_path_func, pUserData, nullptr);
+     }
+ 
+-    basegfx::B2DPolyPolygon aPolyPoly;
+ #if HB_VERSION_ATLEAST(7, 0, 0)
+     hb_font_draw_glyph(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, &aPolyPoly);
+ #else
+     hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, &aPolyPoly);
 #endif
-     return true;
-+#else
-+    return false;
 +#endif
+     return aPolyPoly;
 }
 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-Index: libreoffice-7.5.3.2/vcl/source/gdi/CommonSalLayout.cxx
-===================================================================
--- libreoffice-7.5.3.2.orig/vcl/source/gdi/CommonSalLayout.cxx
-+++ libreoffice-7.5.3.2/vcl/source/gdi/CommonSalLayout.cxx
-@@ -421,10 +421,10 @@ bool GenericSalLayout::LayoutText(vcl::t
+--- libreoffice-7.6.0.1/vcl/source/gdi/CommonSalLayout.cxx	2023-08-07 21:28:15.910488707 +0200
+++ libreoffice-7.6.0.1/vcl/source/gdi/CommonSalLayout.cxx	2023-08-07 21:28:32.850601937 +0200
+@@ -421,10 +421,10 @@
             const int nRunLen = nEndRunPos - nMinRunPos;
 
             int nHbFlags = HB_BUFFER_FLAGS_DEFAULT;
@ -132,7 +115,7 @@ Index: libreoffice-7.5.3.2/vcl/source/gdi/CommonSalLayout.cxx
             if (nMinRunPos == 0)
                 nHbFlags |= HB_BUFFER_FLAG_BOT; /* Beginning-of-text */
             if (nEndRunPos == nLength)
-@@ -545,8 +545,13 @@ bool GenericSalLayout::LayoutText(vcl::t
+@@ -545,8 +545,13 @@
                 if (hb_glyph_info_get_glyph_flags(&pHbGlyphInfos[i]) & HB_GLYPH_FLAG_UNSAFE_TO_BREAK)
                     nGlyphFlags |= GlyphItemFlags::IS_UNSAFE_TO_BREAK;
 
--- a/atklistener-32bit-type-mismatch.patch
+++ b/atklistener-32bit-type-mismatch.patch
@ -1,71 +0,0 @@
-From 469fc646ec782f42e42947f480d5931b97e686ab Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.weghorn@posteo.de>
-Date: Fri, 7 Jul 2023 17:57:03 +0200
-Subject: gtk3 a11y: Use sal_Int32 consistently to fix i386 build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-... after
-
-    commit 3b7db802731826b6cc3b55100470b0c61c1f2dfa
-    Date:   Thu May 4 10:06:14 2023 +0200
-
-        tdf#105404 [API CHANGE] add index to accessiblity change event
-
-Reported to fail like this:
-
-    /home/rene/LibreOffice/git/libreoffice-7-6/vcl/unx/gtk3/a11y/atklistener.cxx:164:6: error: no declaration matches 'void AtkListener::handleChildAdded(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext>&, const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>&, sal_Int32)'
-      164 | void AtkListener::handleChildAdded(
-          |      ^~~~~~~~~~~
-    In file included from /home/rene/LibreOffice/git/libreoffice-7-6/vcl/unx/gtk3/a11y/atklistener.cxx:29:
-    /home/rene/LibreOffice/git/libreoffice-7-6/vcl/unx/gtk3/a11y/atklistener.hxx:54:10: note: candidate is: 'void AtkListener::handleChildAdded(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext>&, const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>&, int)'
-       54 |     void handleChildAdded(
-          |          ^~~~~~~~~~~~~~~~
-
-Change-Id: I03caa5480ef133091ccd5c9ae682629cec3a789b
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154190
-Tested-by: René Engelhard <rene@debian.org>
-Reviewed-by: René Engelhard <rene@debian.org>
-Tested-by: Jenkins
---
- vcl/unx/gtk3/a11y/atklistener.cxx | 2 +-
- vcl/unx/gtk3/a11y/atklistener.hxx | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/vcl/unx/gtk3/a11y/atklistener.cxx b/vcl/unx/gtk3/a11y/atklistener.cxx
-index 854e43133112..b9a053d83a7b 100644
--- a/vcl/unx/gtk3/a11y/atklistener.cxx
-+++ b/vcl/unx/gtk3/a11y/atklistener.cxx
-@@ -207,7 +207,7 @@ void AtkListener::handleChildAdded(
- void AtkListener::handleChildRemoved(
-     const uno::Reference< accessibility::XAccessibleContext >& rxParent,
-     const uno::Reference< accessibility::XAccessible>& rxChild,
-    int nChildIndexHint)
-+    sal_Int32 nChildIndexHint)
- {
-     sal_Int32 nIndex = nChildIndexHint;
-     if (nIndex != -1 && (nIndex < 0 || nIndex >= static_cast<sal_Int32>(m_aChildList.size())))
-diff --git a/vcl/unx/gtk3/a11y/atklistener.hxx b/vcl/unx/gtk3/a11y/atklistener.hxx
-index 546c5e9456fb..e286f40e5a19 100644
--- a/vcl/unx/gtk3/a11y/atklistener.hxx
-+++ b/vcl/unx/gtk3/a11y/atklistener.hxx
-@@ -54,13 +54,13 @@ private:
-     void handleChildAdded(
-         const css::uno::Reference< css::accessibility::XAccessibleContext >& rxParent,
-         const css::uno::Reference< css::accessibility::XAccessible>& rxChild,
-        int nIndexHint);
-+        sal_Int32 nIndexHint);
- 
-     // Process CHILD_EVENT notifications with a child removed
-     void handleChildRemoved(
-         const css::uno::Reference< css::accessibility::XAccessibleContext >& rxParent,
-         const css::uno::Reference< css::accessibility::XAccessible>& rxChild,
-        int nIndexHint);
-+        sal_Int32 nIndexHint);
- 
-     // Process INVALIDATE_ALL_CHILDREN notification
-     void handleInvalidateChildren(
-- 
-cgit v1.2.1
-
--- a/boost_1_80_0.tar.xz
+++ b/boost_1_80_0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666
-size 17696788
--- a/boost_1_82_0.tar.xz
+++ b/boost_1_82_0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de
+size 17903080
--- a/curl-8.0.1.tar.xz
+++ b/curl-8.0.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0
-size 2575544
--- a/curl-8.1.2.tar.xz
+++ b/curl-8.1.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6
+size 2612652
--- a/fix_harfbuzz_on_sle12_sp5.patch
+++ b/fix_harfbuzz_on_sle12_sp5.patch
@ -1,26 +0,0 @@
-Index: libreoffice-7.5.1.2/vcl/source/font/fontmetric.cxx
-===================================================================
--- libreoffice-7.5.1.2.orig/vcl/source/font/fontmetric.cxx
-+++ libreoffice-7.5.1.2/vcl/source/font/fontmetric.cxx
-@@ -549,20 +549,7 @@ void ImplFontMetricData::ImplInitBaselin
-     double fScale = 0;
-     pFontInstance->GetScale(nullptr, &fScale);
-     hb_position_t nBaseline = 0;
-
-    if (hb_ot_layout_get_baseline(pHbFont,
-             HB_OT_LAYOUT_BASELINE_TAG_HANGING,
-                                HB_DIRECTION_INVALID,
-                                HB_SCRIPT_UNKNOWN,
-                                HB_TAG_NONE,
-                                &nBaseline))
-    {
-        mnHangingBaseline = nBaseline * fScale;
-    }
-    else
-    {
-        mnHangingBaseline = 0;
-    }
-+    mnHangingBaseline = 0;
- }
- 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/graphite2-minimal-1.3.14.tgz
+++ b/graphite2-minimal-1.3.14.tgz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
+size 149974
--- a/harfbuzz-8.0.0.tar.xz
+++ b/harfbuzz-8.0.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79
+size 18793316
--- a/icu4c-72_1-data.zip
+++ b/icu4c-72_1-data.zip
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea
-size 19612531
--- a/icu4c-72_1-src.tgz
+++ b/icu4c-72_1-src.tgz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68
-size 26303933
--- a/icu4c-73_2-data.zip
+++ b/icu4c-73_2-data.zip
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701
+size 19990179
--- a/icu4c-73_2-src.tgz
+++ b/icu4c-73_2-src.tgz
--- a/libassuan-2.5.5.tar.bz2
+++ b/libassuan-2.5.5.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
-size 572263
--- a/libassuan-2.5.6.tar.bz2
+++ b/libassuan-2.5.6.tar.bz2
--- a/libreoffice-7.6.0.1.tar.xz
+++ b/libreoffice-7.6.0.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c2d7b942c062c22198586e5c41f8ab4b7ef8214dc8c4a67eaec979a35983630
-size 279453164
--- a/libreoffice-7.6.0.1.tar.xz.asc
+++ b/libreoffice-7.6.0.1.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSoQ+4ACgkQ9DSh76/u
-rqNDUw/6AlRcokNFLM1DYSgubB1INEHA68V4Apx673zwX5YKdCUBnEYVSLVNIAyM
-XFl/N5OyyMXak6052rdjUAlAwwOlzoCv/N9trFPOO/XHerdv4AVf4EFPwsCQKfaM
-tSNMHcXiC0Q9N56uVlcKe9zG0ZEghMnW3HxHdf0GZ8R4QTPmHOt3Dgre7ItAtk5d
-r6xqIQnUlqJ1tVXh3mbyfa92Xs4E+1pj5wufYZEmFPrpRSeclCcHQfaAXKozcU7r
-eBun4iC6ZJ5bCN5OvGOh+KsyKO7fwdRsqFIwAakYGa++fStihiI0SnC8wtUxjgZ0
-w0GK+o8xSoUjNlvfB5BhjQ5sRRNdW5/axESxXTpUg7QfUzvcE35JZVPinWtQbAxP
-lsSrgFFqabk6RVYoRmTgET+er3IoOSxXqfZx6qc76aySjyCWnbFyifrRvZ831Qx3
-EvD0LefzGtm79vSdPk1A41eczfrMrlTaaIwX78kmX+Fa/OJtOtPqBvOHjuyfC7a3
-Y+uMKUupfTF6uxfdmabwdRb+RjMFZJX77zw0aIcD7Lx48gVQ4Gtd3xRhVCGzO92X
-OXwyiaxJ0mpQu6XC9LsK3B9ZvgSiWw6NV+oNSdKV9RiOnTzS6fVj/iUZr5YOIdUq
-nYKFgSZx4hcyV36d7YkGlgK2y3GuFm3Mt1FD7fLKO99nkbdMdng=
-=qUMt
-----END PGP SIGNATURE-----
--- a/libreoffice-7.6.0.2.tar.xz
+++ b/libreoffice-7.6.0.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b782a7c1189efdb3205e58423fde9241cf37ebfbb3da4c7300f2de6bb45147cd
+size 279991368
--- a/libreoffice-7.6.0.2.tar.xz.asc
+++ b/libreoffice-7.6.0.2.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmTEBtUACgkQ9DSh76/u
+rqOnkg//UUUkyhZwjsH64RoRYZN9FmOErlWfTKHclcgGmj1TB3+x9qGBBx0yG5xV
+/p/RudPE4GVZ7r52HWdbsg8ptL44H1aXzkFEtLztX2Sq3YB7LCn9rDR3lEv5jxUW
+TYtBzpR8aIh1jXWTphJpUCA/8R3TIa+ifpV2AD69OZysLUlmKmRIYWq1y2IP2dY8
+hO0Nwgfs/Rz7KsCqHXlpQJJayNdmWn2OiPnQUrLIkXgsjaAIVQ8OWkaSqQBtvxhI
+NZtHbf8fy7PTmATYWeaTqfd0M1PjxOudB6HS/Om0PrScHoLBnVpgiraR5SMiUwGp
+atT6151ceVLFe80JMg+j8xWTZmad1m8INOxzbqK1byZJMtNWdBj91oEeZRk7Iv0m
+nfX2qyqtiQ3rXT/uR7SUivRMixIVnCLlq/wlYZmX0Jj5R/pgBa1dEByG5i5w4ZM3
+6UCH1n6005PLdPL5SFUUiMcYqexbDKha+1mK7be8e27hhDOIuQ9RdiqdiykmhvF4
+A9VxbQSdtoVUTNWu4pw+XrksuXZIQpTZITVTKTcJgIq+H+rgSnkW3MvKzevjFN4w
+L483al9aRtGuXSZrgn1GIKRbbeb5Q5MVdMeJMa4JTzKItLY558+ItXlmfLEA4/+V
+yjo3vUR+iL0eaEeqXDr2egPo3Wxe0qPGrTg+lOCLP2x/m0Pqn1o=
+=cvu3
+-----END PGP SIGNATURE-----
--- a/libreoffice-help-7.6.0.1.tar.xz
+++ b/libreoffice-help-7.6.0.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7b85e9f0fa3a224060c01401be4eb580ecacfb2bf23a5ef16f183785a367e99
-size 166959152
--- a/libreoffice-help-7.6.0.1.tar.xz.asc
+++ b/libreoffice-help-7.6.0.1.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSoQ/QACgkQ9DSh76/u
-rqOWHA//baxlyJ+ilzTG0JFpfnKAo4IHZ2ynyZLgQ9glbei1hOIu2q8DZ2WgFpow
-L6hOAbV50bxkzEmJ6R+JQYu9uOkQdQaTm12ypjyZHYm2BcyNuT80yLpU4nQSRU8h
-c5rQahVevVFL8Mx6Et/Yn7CF96x/vh7DjAr8qUzByMb7WDc9qVz8f6kDT6XTlFlB
-nPKlXr/VbToh80Pb3ZEnxMGjLpsAOCztVAgZfLYpIKARRn2yNiGydmb4W4vTrdYp
-wGEfB49wA5DbZYxMlJN8d3ZWsvde6QqqiRGbvYygCTfeb6hz0efzJkTFHTkzHzqp
-VOBnXu1XsK28tMU/izZwJ/DqJRSfJoaPI+2gNsVqByyrMkRPihCxbniSWKkBqlvQ
-0/b9qyG9KeDK7SEF0MV9mPl18L84wF0AyGc7uPGOqLXWCSeld/ZDI7RWo5pcO0CP
-uhMuO4/TQ7fTV4mohlo+DXrSiq7LGk3snNbPDxTxQx2vRESn6WOod5IWmyT0tf/n
-nO9vs/ftJIz9AQ4nRE5wIHPMARgRbaXN5M6Y5C2MWrIJCzQT4midgRxmTGHV178Y
-tCcdwMMhgW1TU21MrnR9oUiXR3ExGDEMebTf72/K3al4d81dyECwda7fr4iYwb8a
-hcyvR46JZk+Wx2n9LLn6QrgYgsK191fxLCiiPFVkzcRjJBPe7DM=
-=aVms
-----END PGP SIGNATURE-----
--- a/libreoffice-help-7.6.0.2.tar.xz
+++ b/libreoffice-help-7.6.0.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7ce1b54bf03b54bf788d8bd81241e38060362e983883b202f0c453e7622f9ea
+size 166959328
--- a/libreoffice-help-7.6.0.2.tar.xz.asc
+++ b/libreoffice-help-7.6.0.2.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmTEBt4ACgkQ9DSh76/u
+rqM/Ew/+NjyznVZGI6qRZ9uLtLdWYlhifamrTgh6UZoS7D2iIS15reQpvmO20PHH
+TkwALkbUC33V/dKWAy8+e8dYX94Lgh/Z35HRvSRfscKns92aADRk/lbbMHx7Jsc0
+LAC2GMG7wm5sEVIvWBACGpf9qhrg8i20C+66SEDZej2/UarbDyj6kWzwQ6vKW4QE
+qbCT+pfEsYSin+RMHZhvlhuV56PCpUSsXSwXAVfdvQDFgd7cQ3xRoIO+MK2G24QT
+LA600yq4F7VyK9GQPYyMVmXw7lyJH/L56Jm8jip18uUdvNSKjom2iYARw6sHyqk3
+Is5RXtmLlOzjPCBTircco6CHhchi9oybMNplBGlBk1fDmhrt3TM6DfmxnS0aO9HF
+jEITwKWY06RclznbMvX9H9zwiNidGkFNVTrDLBzHPMMNbrtLvLWACzT5BOQI7Zz2
+Ep2nZZ0QLdKSVqa6GU4j7/UyBZbwNlsjodRo+Z6/rUxQB3CkoPEGSPFMO+MjmTJq
+FnnE9cMOt3aeBMlzvJwKmcDprqexw4p2j5qH0x3tqfNjGTDjyz0cR+K8Cf6HglHJ
+1JVOznzFVycv5jixhzG6WfwUropasyyUXXxtcUhCzgg/DKFt0mu1MxlBYaWdyBmg
+NRsqxEi9zPinmoa5N9zcEEyuPhQt5mZOAGSC8ZXBbvDSae/BPSE=
+=SUwA
+-----END PGP SIGNATURE-----
--- a/libreoffice-translations-7.6.0.1.tar.xz
+++ b/libreoffice-translations-7.6.0.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8edd2fb3c8f4f80416f52b40fdfeca775469b1660706721a07d10e5711a245b
-size 216354424
--- a/libreoffice-translations-7.6.0.1.tar.xz.asc
+++ b/libreoffice-translations-7.6.0.1.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSoQ/QACgkQ9DSh76/u
-rqMV0xAAuvFagEKJYKEqG5CccoHuSJiWSWw+1nPVW7w15GEp+8F78yTbi9LL4tt4
-A4Gh4OZFR40Rfb5OK9SBV6+7ybvCPuHthOGd/C7ltJ3ZBK1BbYAIaaAwh9Fj3hct
-LIgIuS/3wWtSqjoB3/+kLFDXVnX2OUKQePYAjtugIzLC92n2KMHcmd2WbJUrQkX/
-5h+I+vVRKBmfbuGxekmIhU22Rv5GdL9VatGh9QnzXy+WDwn5s9QutpUsKPsVBkwa
-iSj5C9cM+fJulrBc5JjfDhXYhj6Z8LgtnJZ+tGJYDK3ezKzoAvoycgwCRUMzLPLK
-pF6HsCzRDEjmhSbG0t5/PbXGo/70AFy/oNdXppnhFjB3/FkTl0XVNoG5q6nsxjoJ
-nqogQjRmdkKTTXB3L4Tm5DROo6ftkoofhhoCweYwYTcq5kunCUj8rXv6Gi7igOSL
-kmWu45UKRKQH0Pf7SWBY2pbkm7oeKUg+B6a/YI73j7bIBHmy5jqPLV09NQhf6P/d
-GWb7GSTL6hxwC1NaZ4V/MHa8Nh580vgSkkPbp3lWy6yOAXmfERmwg0JSOMnqqjD5
-4WPrrj45AaUARyBoiemPlp45TBpOLYudwOgjbt1LiMvxk8ZidJ8kd13vhkrBJq0P
-brvz4iIEtBjnLQ23Kaejm9As1BdAR8jg93hJMzPUVQg1knnomXU=
-=x9Ly
-----END PGP SIGNATURE-----
--- a/libreoffice-translations-7.6.0.2.tar.xz
+++ b/libreoffice-translations-7.6.0.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42a3591d5db65c452247e2dac84ac8371cff0e32b2d3d6ee946743223a92c73a
+size 216453452
--- a/libreoffice-translations-7.6.0.2.tar.xz.asc
+++ b/libreoffice-translations-7.6.0.2.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmTEBt8ACgkQ9DSh76/u
+rqOFyQ//UptJxlC3wWNEK49oIAIc713BbnfvMluN3JSRif6X2x1MAy6jG6fyjpQw
+fimvxZOQbW/iDKdyXrqJf1rqjPu2F0JTfehAlVpaZAWnjNuucfkhI5vdJ0wqyBxY
+BT7ZaCgNh7OXRafUTzHVagZ3Kshy4GEAp6UQIk/9PxrEdq6hcAUk2+0kD/Nuwr9X
+N831jizcInON45zmHad3kDJU+M/U4tpF9KsKp0KFqJ60O3s26ow+3b58LkZ8CTP4
+Ogt4hUWXZPspeIiGyD7oKwzaa3y2Q5ecpkyJfylnsgxm11MoNPf9tZXjmWwT1hhY
+QdXIShGqw823r3uyCzd08LTGWzAOK449mc5EPBFG/mrVQ9l4vu0E1LfmapI345u7
+CspJFp8xTgs+6w14PD0aofAfNBhxOFRVIksB+wSPCeuCVEmIEIkzh/i3184kscJQ
+U/gB/o5refJo4tz7PPA6E8G4YtIPj3u23c+6BT/1qtMQ636IHD0ssfCDPrkuNl65
+hNkom3uYKGSgZZVvRVrkXPWliPMWUWr6vv+cHOvmEUNGe7Z/i0g1fGoFvU2tcBxS
+CTJfVdso4vCW3BQ2LDA7HEdhylOPf2Psp4W43YNZANvnhS9e0AThebfwMsP/HujN
+srQ+qBrweuebJB+a37u/bNAsVC3vbYmJ906Mjy7YcZAcu/UHqas=
+=0rMO
+-----END PGP SIGNATURE-----
--- a/libreoffice.changes
+++ b/libreoffice.changes
@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Tue Aug  8 21:34:27 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Update to 7.6.0.2:
+  https://wiki.documentfoundation.org/ReleaseNotes/7.6
+  https://wiki.documentfoundation.org/Releases/7.6.0/RC1
+- Update bundled dependencies:
+  * boost_1_80_0.tar.xz - > boost_1_82_0.tar.xz
+  * curl-8.0.1.tar.xz -> curl-8.1.2.tar.xz
+  * icu4c-72_1-data.zip ->  icu4c-73_2-data.zip
+  * icu4c-72_1-src.tgz -> icu4c-73_2-src.tgz
+  * libassuan-2.5.5.tar.bz2 -> libassuan-2.5.6.tar.bz2
+  * poppler-22.12.0.tar.xz -> poppler-23.06.0.tar.xz
+  * poppler-data-0.4.11.tar.gz -> poppler-data-0.4.12.tar.gz
+- New bundled dependencies:
+  * graphite2-minimal-1.3.14.tgz
+  * harfbuzz-8.0.0.tar.xz
+    + needed for SLE12-SP2, where harfbuzz is really old
+- Removed patches:
+  * atklistener-32bit-type-mismatch.patch
+    + integrated upstream
+  * fix_harfbuzz_on_sle12_sp5.patch
+    + not needed, since SLE12-SP5 uses now the bundled harfbuzz
+- Added patch:
+  * python34-no-f-strings.patch
+    + Applied on SLE12-SP5
+    + Do not format using F-strings, since it is python 3.6+ feature
+      and SLE12-SP5 has python 3.4
+- Refreshed patch:
+  * 0002-Revert-Require-HarfBuzz-5.1.0.patch
+
 -------------------------------------------------------------------
 Mon Aug  7 18:15:51 UTC 2023 - Fridrich Strba <fstrba@suse.com>

--- a/libreoffice.spec
+++ b/libreoffice.spec
@ -16,6 +16,7 @@
 #


+%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
 # extensions
 %define         numbertext_version 0.9.5
 # Urls
@ -38,6 +39,7 @@
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
 %bcond_without system_gpgme
 %bcond_without system_curl
+%bcond_without system_harfbuzz
 %else
 # Hack in the bundled libs to not pop up on requires/provides to avoid
 # faking libreoffice provide some system packages
@ -46,10 +48,11 @@
 %global __requires_exclude ^libgpgmepp\\.so.*$
 %bcond_with system_gpgme
 %bcond_with system_curl
+%bcond_with system_harfbuzz
 %endif
 %bcond_with firebird
 Name:           libreoffice
-Version:        7.6.0.1
+Version:        7.6.0.2
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        LGPL-3.0-or-later AND MPL-2.0+
@ -75,7 +78,7 @@ Source452:      %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t
 # GPGME bundle list
 Source1000:     %{external_url}/gpgme-1.18.0.tar.bz2
 Source1001:     %{external_url}/libgpg-error-1.43.tar.bz2
-Source1002:     %{external_url}/libassuan-2.5.5.tar.bz2
+Source1002:     %{external_url}/libassuan-2.5.6.tar.bz2
 # Internal bundled stuff we can't remove
 # To build this we would pull cygwin; not worth it
 Source2001:     https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@ -108,7 +111,6 @@ Patch6:         gcc11-fix-error.patch
 Patch9:         fix_math_desktop_file.patch
 Patch10:        fix_gtk_popover_on_3.20.patch
 Patch11:        fix_webp_on_sle12_sp5.patch
-Patch12:        fix_harfbuzz_on_sle12_sp5.patch
 # PATCH-FIX-SUSE use fixmath shared library
 Patch14:        use-fixmath-shared-library.patch
 # PATCH-FIX-SUSE Fix make distro-pack-install
@ -121,8 +123,8 @@ Patch101:       0001-Revert-java-9-changes.patch
 Patch990:       install-with-hardlinks.diff
 # save time by relying on rpm check rather than doing stupid find+grep
 Patch991:       libreoffice-no-destdircheck.patch
-# Fix build on i586
-Patch992:       atklistener-32bit-type-mismatch.patch
+# Fix build on sle12
+Patch992:       python34-no-f-strings.patch
 BuildRequires:  %{name}-share-linker
 BuildRequires:  ant
 BuildRequires:  autoconf
@ -137,7 +139,7 @@ BuildRequires:  zlib-devel
 %if %{with system_curl}
 BuildRequires:  curl-devel >= 7.68.0
 %else
-Source2013:     %{external_url}/curl-8.0.1.tar.xz
+Source2013:     %{external_url}/curl-8.1.2.tar.xz
 %endif
 # Needed for tests
 BuildRequires:  dejavu-fonts
@ -198,12 +200,17 @@ BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.40
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(graphite2) >= 0.9.3
 BuildRequires:  pkgconfig(gssrpc)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.20
-BuildRequires:  pkgconfig(harfbuzz) >= 0.9.42
-BuildRequires:  pkgconfig(harfbuzz-icu) >= 0.9.42
+%if %{with system_harfbuzz}
+BuildRequires:  pkgconfig(graphite2) >= 0.9.3
+BuildRequires:  pkgconfig(harfbuzz) >= 2.6.8
+BuildRequires:  pkgconfig(harfbuzz-icu) >= 2.6.8
+%else
+Source2025:     %{external_url}/harfbuzz-8.0.0.tar.xz
+Source2026:     %{external_url}/graphite2-minimal-1.3.14.tgz
+%endif
 BuildRequires:  pkgconfig(hunspell)
 BuildRequires:  pkgconfig(krb5)
 BuildRequires:  pkgconfig(lcms2)
@ -279,9 +286,9 @@ Provides:       %{name}-icon-theme-oxygen = %{version}
 Obsoletes:      %{name}-icon-theme-oxygen < %{version}
 %if 0%{?suse_version} < 1550
 # Too old boost on the system
-Source2020:     %{external_url}/boost_1_80_0.tar.xz
-Source2023:     %{external_url}/poppler-22.12.0.tar.xz
-Source2024:     %{external_url}/poppler-data-0.4.11.tar.gz
+Source2020:     %{external_url}/boost_1_82_0.tar.xz
+Source2023:     %{external_url}/poppler-23.06.0.tar.xz
+Source2024:     %{external_url}/poppler-data-0.4.12.tar.gz
 %else
 BuildRequires:  libboost_date_time-devel
 BuildRequires:  libboost_filesystem-devel
@ -293,8 +300,8 @@ BuildRequires:  pkgconfig(poppler-cpp)
 %endif
 %if 0%{?suse_version} < 1500
 # Too old icu on the system
-Source2021:     %{external_url}/icu4c-72_1-src.tgz
-Source2022:     %{external_url}/icu4c-72_1-data.zip
+Source2021:     %{external_url}/icu4c-73_2-src.tgz
+Source2022:     %{external_url}/icu4c-73_2-data.zip
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  libBox2D-devel
 BuildRequires:  libmysqlclient-devel
@ -318,13 +325,13 @@ BuildConflicts: java-devel < 9
 BuildConflicts: java-headless < 9
 BuildRequires:  pkgconfig(libopenjp2)
 %endif
-# Dragonbox requires gcc11
-%if 0%{?suse_version} > 1550
-BuildRequires:  gcc >= 11
-BuildRequires:  gcc-c++ >= 11
+# Dragonbox requires C++17
+%if 0%{?is_opensuse} || 0%{?sle_version} >= 150000
+BuildRequires:  gcc >= 7
+BuildRequires:  gcc-c++ >= 7
 %else
-BuildRequires:  gcc11
-BuildRequires:  gcc11-c++
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
 %endif
 %if 0%{?suse_version}
 # needed by python3_sitelib
@ -457,12 +464,7 @@ Obsoletes:      %{name}-base-drivers-mysql
 %if %{with firebird}
 Requires:       %{name}-base-drivers-firebird
 %else
-%ifarch %{ix86}
-Requires:       jre-32 >= 1.8
-%endif
-%ifarch x86_64 aarch64 riscv64
-Requires:       jre-64 >= 1.8
-%endif
+Requires:       jre >= 1.8
 %endif

 %description base
@ -675,12 +677,7 @@ Software Development Kit (SDK).
 Summary:        OfficeBean Java Bean component for LibreOffice
 Group:          Productivity/Office/Suite
 Requires:       %{name} = %{version}
-%ifarch %{ix86}
-Requires:       jre-32 >= 1.8
-%endif
-%ifarch x86_64 aarch64 ppc64le riscv64
-Requires:       jre-64 >= 1.8
-%endif
+Requires:       jre >= 1.8

 %description officebean
 With the OfficeBean, a developer can easily write Java applications,
@ -706,12 +703,7 @@ Requires:       libreoffice-calc = %{version}
 Requires:       libreoffice-pyuno = %{version}
 Requires(pre):  libreoffice = %{version}
 # the watchWindow extension is written in java
-%ifarch %{ix86}
-Requires:       jre-32 >= 1.8
-%endif
-%ifarch x86_64 aarch64 ppc64le riscv64
-Requires:       jre-64 >= 1.8
-%endif
+Requires:       jre >= 1.8

 %description calc-extensions
 This package provides extensions for LibreOffice Calc:
@ -726,12 +718,7 @@ Group:          Productivity/Office/Suite
 Requires:       libreoffice-writer = %{version}
 Requires(pre):  libreoffice = %{version}
 # the wiki extension is written in java
-%ifarch %{ix86}
-Requires:       jre-32 >= 1.8
-%endif
-%ifarch x86_64 aarch64 ppc64le riscv64
-Requires:       jre-64 >= 1.8
-%endif
+Requires:       jre >= 1.8

 %description writer-extensions
 This package provides extensions for LibreOffice Writer:
@ -1035,7 +1022,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %if 0%{?suse_version} < 1500
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 %patch101 -p1
 %endif
 %patch14 -p1
@ -1045,7 +1031,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %endif
 %patch990 -p1
 %patch991 -p1
+%if 0%{?suse_version} < 1550
 %patch992 -p1
+%endif

 # Disable some of the failing tests (some are random)
 %if 0%{?suse_version} < 1330
@ -1095,12 +1083,12 @@ ARCH_FLAGS="`echo %{optflags} -flifetime-dse=1 | sed -e 's/^-g /-g1 /g' -e 's/ -
 ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`"
 %endif
 CFLAGS="$ARCH_FLAGS"
-CXXFLAGS="$ARCH_FLAGS"
+CXXFLAGS="-std=c++17 $ARCH_FLAGS"
 export ARCH_FLAGS CFLAGS CXXFLAGS

-%if 0%{?suse_version} < 1550
-export CC=gcc-11
-export CXX=g++-11
+%if !0%{?is_opensuse} && 0%{?sle_version} < 150000
+export CC=gcc-7
+export CXX=g++-7
 %endif

 # Fake the epoch stuff in generated zip files
@ -1202,6 +1190,13 @@ export NOCONFIGURE=yes
        --with-system-curl \
 %else
        --without-system-curl \
+%endif
+%if %{with system_harfbuzz}
+        --with-system-harfbuzz \
+        --with-system-graphite \
+%else
+        --without-system-harfbuzz \
+        --without-system-graphite \
 %endif
        --enable-evolution2 \
        --enable-dbus \
@ -1217,7 +1212,16 @@ export NOCONFIGURE=yes
        --enable-symbols \
        --with-gdrive-client-secret="${google_default_client_secret}" \
        --with-gdrive-client-id="${google_default_client_id}" \
+%ifnarch s390x ppc64 ppc
        --enable-skia \
+%else
+        --disable-skia \
+%endif
+%ifarch %{aarch64}
+%if 0%{?suse_version} < 1550
+        --disable-pdfium \
+%endif
+%endif
        --with-libbase-jar=/usr/share/java/libbase.jar \
        --with-libxml-jar=/usr/share/java/libxml.jar \
        --with-flute-jar=/usr/share/java/flute.jar \
--- a/poppler-22.12.0.tar.xz
+++ b/poppler-22.12.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
-size 1845856
--- a/poppler-23.06.0.tar.xz
+++ b/poppler-23.06.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
+size 1867384
--- a/poppler-data-0.4.11.tar.gz
+++ b/poppler-data-0.4.11.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
-size 4497282
--- a/poppler-data-0.4.12.tar.gz
+++ b/poppler-data-0.4.12.tar.gz
--- a/python34-no-f-strings.patch
+++ b/python34-no-f-strings.patch
@ -0,0 +1,47 @@
+--- libreoffice-7.6.0.1/solenv/bin/desktop-translate.py	2023-08-08 19:29:16.088847384 +0200
+++ libreoffice-7.6.0.1/solenv/bin/desktop-translate.py	2023-08-08 19:36:37.413324064 +0200
+@@ -62,7 +62,7 @@
+ o = parser.parse_args()
+ 
+ if o.template_dir is None:
+-    template_dir = f"{o.workdir}/{o.prefix}"
+    template_dir = '{}/{}'.format(o.workdir, o.prefix)
+ else:
+     template_dir = o.template_dir
+ 
+@@ -85,7 +85,7 @@
+         entry = {}
+         # For every section in the specified ulf file there should exist
+         # a template file in $workdir ..
+-        entry["outfile"] = f"{template_dir}{template}.{o.ext}"
+        entry["outfile"] = "{}{}.{}".format(template_dir, template, o.ext)
+         entry["translations"] = {}
+         entry["key"] = key
+         templates[heading] = entry
+@@ -130,12 +130,12 @@
+         if o.ext == "str":
+             continue
+         sys.exit(
+-            f"Warning: No template found for item '{template}' : '{outfilename}'\n"
+            "Warning: No template found for item '{}' : '{}'\n".format(template, outfilename)
+         )
+     processed += 1
+ 
+     # open output file
+-    tmpfilename = f"{outfilename}.tmp"
+    tmpfilename = '{}.tmp'.format(outfilename)
+     outfile = io.open(tmpfilename, "w", encoding="utf-8")
+ 
+     # emit the template to the output file
+@@ -157,9 +157,9 @@
+                     if o.ext in ("desktop", "str"):
+                         if o.ext == "desktop":
+                             value = encode_desktop_string(value)
+-                        outfile.write(f"{OUTKEY}[{locale}]={value}\n")
+                        outfile.write("{}[{}]={}\n".format(OUTKEY, locale, value))
+                     else:
+-                        outfile.write(f"\t[{locale}]{OUTKEY}={value}\n")
+                        outfile.write("\t[{}]{}={}\n".format(locale, OUTKEY, value))
+ 
+     template_file.close()
+