- updated to 7.5.1.2

diff --git a/boost1.81.patch b/boost1.81.patch
deleted file mode 100644 (file)
index e92fa5c..0000000
--- a/boost1.81.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 23dcd4339428e4080029ec5ae658e75f01e79a62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Sun, 27 Nov 2022 18:59:24 +0700
-Subject: i18n: fix build with Boost 1.81.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Boost.Locale since 1.81.0 switch to enum classes for facet type [1].
-Switch our resource manager accordingly.
-
-1: https://github.com/boostorg/locale/commit/e5ed439ea39a4de915e9fb939cca95cae7d9d8d1
-
-Change-Id: Ief215363ceb79b2019606b20a7cde55c8df6a042
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143343
-Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- unotools/source/i18n/resmgr.cxx | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'unotools/source/i18n')
-
-diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
-index ddedf5b9e8a2..3a7116350062 100644
---- a/unotools/source/i18n/resmgr.cxx
-+++ b/unotools/source/i18n/resmgr.cxx
-@@ -127,8 +127,13 @@ namespace Translate
-         if (aFind != aCache.end())
-             return aFind->second;
-         boost::locale::generator gen;
-+#if BOOST_VERSION < 108100
-         gen.characters(boost::locale::char_facet);
-         gen.categories(boost::locale::message_facet | boost::locale::information_facet);
-+#else
-+        gen.characters(boost::locale::char_facet_t::char_f);
-+        gen.categories(boost::locale::category_t::message | boost::locale::category_t::information);
-+#endif
- #if defined(ANDROID)
-         OString sPath(OString(lo_get_app_data_dir()) + "/program/resource");
- #else
--- 
-cgit v1.2.1
-

diff --git a/disable-failing-test.patch b/disable-failing-test.patch
index 04052bfd724f586c28f9b4769796edf2ce53f1c2..ac31b09f9fa5493dc96b79591936b5e6b6006278 100644 (file)
--- a/disable-failing-test.patch
+++ b/disable-failing-test.patch
@@ -1,16 +1,16 @@
---- libreoffice-6.0.0.3/sd/qa/unit/import-tests.cxx~   2018-01-24 21:31:03.000000000 +0100
-+++ libreoffice-6.0.0.3/sd/qa/unit/import-tests.cxx    2018-02-02 08:36:16.309008496 +0100
-@@ -171,7 +171,6 @@ public:
+--- libreoffice-7.5.1.2/sd/qa/unit/import-tests.cxx.orig       2023-03-09 20:09:43.192750947 +0100
++++ libreoffice-7.5.1.2/sd/qa/unit/import-tests.cxx    2023-03-09 20:11:34.780090894 +0100
+@@ -159,7 +159,6 @@ public:
  
      CPPUNIT_TEST_SUITE(SdImportTest);
  
 -    CPPUNIT_TEST(testDocumentLayout);
-     CPPUNIT_TEST(testTdf142645);
-     CPPUNIT_TEST(testTdf142915);
-     CPPUNIT_TEST(testTdf142913);
---- libreoffice-6.3.0.4/dbaccess/Module_dbaccess.mk~   2019-08-06 19:26:35.000000000 +0200
-+++ libreoffice-6.3.0.4/dbaccess/Module_dbaccess.mk    2019-08-09 09:06:37.432422956 +0200
-@@ -33,18 +33,6 @@
+     CPPUNIT_TEST(testTdf152434);
+     CPPUNIT_TEST(testConnectors);
+     CPPUNIT_TEST(testTdf153036_resizedConnectorL);
+--- libreoffice-7.5.1.2/dbaccess/Module_dbaccess.mk.orig       2023-03-09 20:09:43.192750947 +0100
++++ libreoffice-7.5.1.2/dbaccess/Module_dbaccess.mk    2023-03-09 20:12:12.233650210 +0100
+@@ -35,18 +35,6 @@ $(eval $(call gb_Module_add_targets,dbac
  ))
  
  ifneq ($(OS),iOS)
@@ -26,6 +26,6 @@
 -))
 -endif
 -
+ ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
  $(eval $(call gb_Module_add_check_targets,dbaccess,\
        CppunitTest_dbaccess_dialog_save \
-       CppunitTest_dbaccess_empty_stdlib_save \

diff --git a/gpgme1.18.patch b/gpgme1.18.patch
deleted file mode 100644 (file)
index de323c2..0000000
--- a/gpgme1.18.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f7e170eb084cd4e92818de966b287330184749a8 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Wed, 24 Aug 2022 09:55:33 +0200
-Subject: Make configure work with gpgme >= 1.18
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Sam James wrote:
-> gpgme-1.18.0 dropped a bunch of internal symbols,
-> including progress_callback (see e.g. callbacks.h
-> which has a comment at the top saying it's internal).
-
-Plausibly the workaround to not link against older KDE-specific distro
-packages is not needed anymore.
-
-Check for main as a workaround as we do for other C++ libraries, too.
-
-Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667
-Tested-by: Jenkins
-Reviewed-by: Sam James <sam@gentoo.org>
-Reviewed-by: René Engelhard <rene@debian.org>
----
- configure.ac | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-(limited to 'configure.ac')
-
-diff --git a/configure.ac b/configure.ac
-index 24cb01aa0db0..61806988b94b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -12539,12 +12539,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE
-         # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
-         AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
-             [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp development package])], [])
--        # progress_callback is the only func with plain C linkage
--        # checking for it also filters out older, KDE-dependent libgpgmepp versions
--        AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ],
--            [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
-         AC_CHECK_HEADER(gpgme.h, [],
-             [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
-+        AC_CHECK_LIB(gpgmepp, main, [],
-+            [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
-+      GPGMEPP_LIBS=-lgpgmepp
-     else
-         AC_MSG_RESULT([internal])
-         BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
--- 
-cgit v1.2.1
-

diff --git a/libreoffice-poppler-22.09.0.patch b/libreoffice-poppler-22.09.0.patch
deleted file mode 100644 (file)
index 74a7d12..0000000
--- a/libreoffice-poppler-22.09.0.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b7d63694985bbb1cf86eb71769feadb28ce68c17 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Sep 2022 04:31:18 +0100
-Subject: Fix build with Poppler 22.09.0
-
-With Poppler 22.09.0, LO fails to build with:
-```
-/var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments
-    state->getLineDash(&dashArray, &arrayLen, &startOffset);
-    ~~~~~~~~~~~~~~~~~~             ^~~~~~~~~~~~~~~~~~~~~~~
-/usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here
-    const std::vector<double> &getLineDash(double *start)
-                               ^
-1 error generated.
-```
-
-Poppler changed the getLineDash interface:
-```
--    void getLineDash(double **dash, int *length, double *start)
-+    const std::vector<double> &getLineDash(double *start)
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
-Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139249
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index f12478cb2f4d..3ad139b65fa3 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -678,8 +678,15 @@ void PDFOutDev::updateLineDash(GfxState *state)
-         return;
-     assert(state);
- 
--    double* dashArray; int arrayLen; double startOffset;
-+    int arrayLen; double startOffset;
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+    const std::vector<double> &dash = state->getLineDash(&startOffset);
-+    const double* dashArray = dash.data();
-+    arrayLen = dash.size();
-+#else
-+    double* dashArray;
-     state->getLineDash(&dashArray, &arrayLen, &startOffset);
-+#endif
- 
-     printf( "updateLineDash" );
-     if( arrayLen && dashArray )
--- 
-cgit v1.2.1
-

diff --git a/libreoffice-poppler.patch b/libreoffice-poppler.patch
deleted file mode 100644 (file)
index bcb2678..0000000
--- a/libreoffice-poppler.patch
+++ /dev/null
@@ -1,156 +0,0 @@
---- libreoffice-7.2.6.2/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx.orig        2022-03-03 14:25:45.000000000 +0100
-+++ libreoffice-7.2.6.2/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx     2022-04-19 20:30:14.031282962 +0200
-@@ -115,6 +115,21 @@ int main(int argc, char **argv)
-     }
- 
-     // PDFDoc takes over ownership for all strings below
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+    auto pFileName = std::make_unique<GooString>(argv[1]);
-+    auto pErrFileName = std::make_unique<GooString>(argv[2]);
-+
-+    // check for password string(s)
-+    std::optional<GooString> pOwnerPasswordStr, pUserPasswordStr;
-+    if( aPwBuf[0] != 0 )
-+        pOwnerPasswordStr = GooString(aPwBuf);
-+    else if( ownerPassword[0] != '\001' )
-+        pOwnerPasswordStr = GooString(ownerPassword);
-+    if( aPwBuf[0] != 0 )
-+        pUserPasswordStr = GooString(aPwBuf);
-+    else if( userPassword[0] != '\001' )
-+        pUserPasswordStr = GooString(userPassword);
-+#else
-     GooString* pFileName    = new GooString(argv[1]);
-     GooString* pErrFileName = new GooString(argv[2]);
- 
-@@ -129,6 +144,7 @@ int main(int argc, char **argv)
-                                 : (userPassword[0] != '\001'
-                                   ? new GooString(userPassword)
-                                   : nullptr ) );
-+#endif
-     if( outputFile[0] != '\001' )
-         g_binary_out = fopen(outputFile,"wb");
- 
-@@ -138,6 +154,15 @@ int main(int argc, char **argv)
-     _setmode( _fileno( g_binary_out ), _O_BINARY );
- #endif
- 
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+    PDFDoc aDoc( std::move(pFileName),
-+                 pOwnerPasswordStr,
-+                 pUserPasswordStr );
-+
-+    PDFDoc aErrDoc( std::move(pErrFileName),
-+                 pOwnerPasswordStr,
-+                 pUserPasswordStr );
-+#else
-     PDFDoc aDoc( pFileName,
-                  pOwnerPasswordStr,
-                  pUserPasswordStr );
-@@ -145,6 +170,7 @@ int main(int argc, char **argv)
-     PDFDoc aErrDoc( pErrFileName,
-                  pOwnerPasswordStr,
-                  pUserPasswordStr );
-+#endif
- 
-     // Check various permissions for aDoc.
-     PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc;
---- libreoffice-7.2.6.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig     2022-03-03 14:25:45.000000000 +0100
-+++ libreoffice-7.2.6.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx  2022-04-19 19:53:39.226719292 +0200
-@@ -147,8 +147,13 @@ namespace pdfi
-         std::unique_ptr<UnicodeMap>             m_pUtf8Map;
-         bool                                    m_bSkipImages;
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+        int  parseFont( long long nNewId, std::shared_ptr<GfxFont> pFont, GfxState* state ) const;
-+        void writeFontFile( std::shared_ptr<GfxFont> gfxFont ) const;
-+#else
-         int  parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
-         void writeFontFile( GfxFont* gfxFont ) const;
-+#endif
- #if POPPLER_CHECK_VERSION(0, 83, 0)
-         static void printPath( const GfxPath* pPath );
- #else
---- libreoffice-7.2.6.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig     2022-03-03 14:25:45.000000000 +0100
-+++ libreoffice-7.2.6.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx  2022-04-19 19:58:44.165967063 +0200
-@@ -427,7 +427,11 @@ static void writeMaskLF( OutputBuffer&
-                          bool              bInvert ) { writeMask_(o_rOutputBuf,str,width,height,bInvert); }
- 
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+int PDFOutDev::parseFont( long long nNewId, std::shared_ptr<GfxFont> gfxFont, GfxState* state ) const
-+#else
- int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) const
-+#endif
- {
-     FontAttributes aNewFont;
-     int nSize = 0;
-@@ -461,23 +465,49 @@ int PDFOutDev::parseFont( long long nNew
-     {
-         // TODO(P3): Unfortunately, need to read stream twice, since
-         // we must write byte count to stdout before
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+        auto buf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
-+        if( buf )
-+        {
-+            aNewFont.isEmbedded = true;
-+            nSize = buf->size();
-+        }
-+#else
-         char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
-         if( pBuf )
-         {
-             aNewFont.isEmbedded = true;
-             gfree(pBuf);
-         }
-+#endif
-     }
- 
-     m_aFontMap[ nNewId ] = aNewFont;
-     return nSize;
- }
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+void PDFOutDev::writeFontFile( std::shared_ptr<GfxFont> gfxFont ) const
-+#else
- void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
-+#endif
- {
-     if( gfxFont->getType() != fontTrueType && gfxFont->getType() != fontType1 )
-         return;
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+    auto buf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
-+    if( !buf )
-+        return;
-+
-+    // ---sync point--- see SYNC STREAMS above
-+    fflush(stdout);
-+
-+    if( fwrite(buf->data(), 1, buf->size(), g_binary_out) != buf->size() )
-+        exit(1); // error
-+    // ---sync point--- see SYNC STREAMS above
-+    fflush(g_binary_out);
-+#else
-     int nSize = 0;
-     char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
-     if( !pBuf )
-@@ -494,6 +524,7 @@ void PDFOutDev::writeFontFile( GfxFont*
-     // ---sync point--- see SYNC STREAMS above
-     fflush(g_binary_out);
-     gfree(pBuf);
-+#endif
- }
- 
- #if POPPLER_CHECK_VERSION(0, 83, 0)
-@@ -747,7 +778,11 @@ void PDFOutDev::updateFont(GfxState *sta
- {
-     assert(state);
- 
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+    auto gfxFont = state->getFont();
-+#else
-     GfxFont *gfxFont = state->getFont();
-+#endif
-     if( !gfxFont )
-         return;
- 

diff --git a/libreoffice.spec b/libreoffice.spec
index 6f15cfc1196c323f89b7ce92a30f2b8c74a90666..8eecf32e17c7b02708fc6aefbb0a16b468236d36 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -3,7 +3,6 @@
 # - fix configure arguments (+ compare with FC)
 # - create CoinMP library package for PLD (https://projects.coin-or.org/CoinMP)
 # - --enable-avahi for Impress remote control? (BR: avahi-devel >= 0.6.10)
-# - --enable-introspection? (BR: gobject-introspection-devel >= 1.32.0)
 # - --with-system-rhino?
 # - system odfvalidator and officeotron?
 # - xapian-omega support for help?
@@ -19,12 +18,15 @@
 %bcond_without java                    # Java support (required for help support)
 %bcond_without kde5                    # KDE5 L&F packages
 %bcond_without gtk3                    # GTK3 L&F
+%bcond_without gtk4                    # GTK4 L&F
 %bcond_without qt5                     # QT5 L&F
+%bcond_without qt6                     # QT6 L&F
 %bcond_with    mono                    # C# bindings (mono not supported as of 6.4.x)
 %bcond_without mozilla                 # Mozilla components (NPAPI plugin)
 %bcond_without i18n                    # i18n packages creation (extra build time)
 %bcond_with    ccache                  # use ccache to speed up builds
 %bcond_with    icecream                # use icecream to speed up builds
+%bcond_without introspection           # GObject introspection files
 %bcond_without parallelbuild           # use greater number of jobs to speed up build (default: 1)
 %bcond_with    tests                   # testsuite execution
 %bcond_without eot                     # Embedded OpenType fonts support
@@ -50,12 +52,16 @@
 %undefine      with_system_hsqldb
 %endif
 
+%if %{without gtk3}
+%undefine      with_introspection
+%endif
 %if %{with kde5}
 %define                with_qt5        1
 %endif
 
-%define                major_ver       7.2.7
+%define                major_ver       7.5.1
 %define                qt5_ver         5.6
+%define                qt6_ver         6
 
 %define                use_jdk         openjdk11
 
@@ -67,18 +73,18 @@ Release:    1
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
-# Source0-md5: 47caa06bcfe227f9e53ab12f1c383124
+# Source0-md5: 5a48583c5a224d6932ee138fbc3c23ff
 Source1:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source1-md5: 428940307203786085448757f900af37
+# Source1-md5: 19a9eb99e64fa90c2a3a70fbafb11424
 Source2:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source2-md5: 0c34e4ca58c32626cb1cd9f42ff66762
+# Source2-md5: 0a1c39d42b120eff303bd787b266a159
 Source3:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source3-md5: e05999e7ffce14b4aee7129fad25f4b2
+# Source3-md5: 2b7a4abc1743551c742a3f07268e63a3
 
 # make (download|fetch) DO_FETCH_TARBALLS=1 WGET=wget
 # but not sure if all are needed?
-Source20:      http://dev-www.libreoffice.org/src/pdfium-4500.tar.bz2
-# Source20-md5:        d9bc09c21cbbc7053b9678f2a9b761ae
+Source20:      http://dev-www.libreoffice.org/src/pdfium-5408.tar.bz2
+# Source20-md5:        a8ae777e121a0fb63f4e8b6779d68ada
 Source21:      http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 # Source21-md5:        17410483b5b5f267aa18b7e00b65e6e0
 Source22:      http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz
@@ -97,59 +103,54 @@ Source30:  https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9
 # Source30-md5:        8249374c274932a21846fa7629c2aa9b
 Source31:      https://dev-www.libreoffice.org/src/dtoa-20180411.tgz
 # Source31-md5:        4295bad62b2524793d8a7ba3e7385501
-Source32:      https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
-# Source32-md5:        76729a69e8ab04f49987c7aa701cadc4
+Source32:      https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
+# Source32-md5:        0a0013856ea701b3023ca4b00f147c72
 Source33:      https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz
 # Source33-md5:        3653bc54e1bcd17ae09a1a7086daa38b
-Source34:      skia-freetype2.11.patch
-
 Patch0:                disable-failing-test.patch
-Patch1:                pld-skia-patches.patch
-Patch2:                %{name}-poppler.patch
-Patch3:                boost1.81.patch
-Patch4:                gpgme1.18.patch
-Patch5:                zxing1.4.patch
-# https://cgit.freedesktop.org/libreoffice/core/patch/?id=b7d63694985bbb1cf86eb71769feadb28ce68c17
-Patch6:                %{name}-poppler-22.09.0.patch
 URL:           https://www.documentfoundation.org/
 BuildRequires: /usr/bin/getopt
 %{?with_firebird:BuildRequires:        Firebird-devel >= 3.0.0.0}
 BuildRequires: GLM
 BuildRequires: ImageMagick
 BuildRequires: OpenGL-devel
+BuildRequires: abseil-cpp-devel
 %{?with_system_agg:BuildRequires:      agg-devel >= 2.3}
-BuildRequires: atk-devel >= 1:1.9.0
+BuildRequires: atk-devel >= 1:2.28.1
 BuildRequires: autoconf >= 2.68
 BuildRequires: automake >= 1:1.9
 BuildRequires: bash
 BuildRequires: bison >= 2.0
 BuildRequires: bluez-libs-devel
 BuildRequires: boost-devel >= 1.66
-BuildRequires: box2d-devel
-BuildRequires: cairo-devel >= 1.8.0
+BuildRequires: box2d-devel >= 2.4.0
+BuildRequires: cairo-devel >= 1.12.0
 %{?with_ccache:BuildRequires:  ccache}
 BuildRequires: clucene-core-devel >= 2.3
 %{?with_system_coinmp:BuildRequires:   coinmp-devel}
 BuildRequires: cppunit-devel >= 1.14.0
 BuildRequires: cups-devel
-BuildRequires: curl-devel >= 7.19.4
+BuildRequires: curl-devel >= 7.68.0
 BuildRequires: dconf-devel >= 0.15.2
 BuildRequires: dbus-devel >= 0.60
+BuildRequires: dragonbox-devel = 1.1.3
 BuildRequires: expat-devel
 BuildRequires: flex >= 2.6.0
 BuildRequires: fontconfig-devel >= 2.4.1
-# pkgconfig(freetype2) >= 9.9.3
-BuildRequires: freetype-devel >= 1:2.2.0
+# pkgconfig(freetype2) >= 21.0.15
+BuildRequires: freetype-devel >= 1:2.8.1
 BuildRequires: gdb
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.38
+#BuildRequires:        gobject-introspection-devel >= 1.32.0
 BuildRequires: gperf
 BuildRequires: gpgme-c++-devel
 BuildRequires: graphite2-devel >= 0.9.3
 BuildRequires: gstreamer-devel >= 1.0
 BuildRequires: gstreamer-plugins-base-devel >= 1.0
 %{?with_gtk3:BuildRequires:    gtk+3-devel >= 3.20}
-BuildRequires: harfbuzz-icu-devel >= 0.9.42
+%{?with_gtk4:BuildRequires:    gtk4-devel >= 4}
+BuildRequires: harfbuzz-icu-devel >= 5.1.0
 %{?with_system_hunspell:BuildRequires: hunspell-devel >= 1.2.2}
 %{?with_system_hyphen:BuildRequires:   hyphen-devel}
 %{?with_icecream:BuildRequires:        icecream}
@@ -175,35 +176,38 @@ BuildRequires:    lcms2-devel >= 2
 BuildRequires: libabw-devel >= 0.1.0
 BuildRequires: libcdr-devel >= 0.1
 %{?with_system_cmis:BuildRequires:     libcmis-devel >= 0.5.2}
-BuildRequires: libe-book-devel >= 0.1
+BuildRequires: libe-book-devel >= 0.1.2
 %{?with_eot:BuildRequires:     libeot-devel >= 0.01}
 BuildRequires: libepoxy-devel >= 1.2
 BuildRequires: libepubgen-devel >= 0.1.0
-BuildRequires: libetonyek-devel >= 0.1.4
+BuildRequires: libetonyek-devel >= 0.1.10
 BuildRequires: libexttextcat-devel >= 3.4.1
 BuildRequires: libfreehand-devel >= 0.1.0
 BuildRequires: libicu-devel >= 4.6
 BuildRequires: libjpeg-devel
 BuildRequires: liblangtag-devel >= 0.4.0
 BuildRequires: libmspub-devel >= 0.1
-BuildRequires: libmwaw-devel >= 0.3.1
+BuildRequires: libmwaw-devel >= 0.3.21
 BuildRequires: libnumbertext-devel >= 1.0.6
 BuildRequires: libodfgen-devel >= 0.1.1
-BuildRequires: liborcus-devel >= 0.16.0
+BuildRequires: liborcus-devel >= 0.17.2
+BuildRequires: liborcus-devel < 0.18
 BuildRequires: libpagemaker-devel >= 0.0.2
 BuildRequires: libpng-devel
 BuildRequires: libqxp-devel
 BuildRequires: libraptor2-devel >= 2.0.7
 BuildRequires: librevenge-devel >= 0.0.1
 BuildRequires: librsvg-devel >= 2.14
-BuildRequires: libstaroffice-devel
+BuildRequires: libstaroffice-devel >= 0.0.7
 BuildRequires: libstdc++-devel >= 6:7
+BuildRequires: libtiff-devel >= 4
 # for uuidgen
 BuildRequires: libuuid
 BuildRequires: libvisio-devel >= 0.1
+BuildRequires: libwebp-devel
 BuildRequires: libwpd-devel >= 0.10.0
 BuildRequires: libwpg-devel >= 0.3.0
-BuildRequires: libwps-devel >= 0.4.10
+BuildRequires: libwps-devel >= 0.4.12
 BuildRequires: libxml2-devel >= 2.0
 BuildRequires: libxml2-progs
 BuildRequires: libxslt-devel
@@ -211,7 +215,8 @@ BuildRequires:      libxslt-progs
 BuildRequires: libzmf-devel
 BuildRequires: lp_solve-devel >= 5.5
 BuildRequires: make >= 1:3.82
-BuildRequires: mdds-devel >= 1.5.0
+BuildRequires: mdds-devel >= 2.0.0
+BuildRequires: mdds-devel < 2.1
 %{?with_mono:BuildRequires:    mono-csharp >= 1.2.3}
 %{?with_mono:BuildRequires:    mono-static >= 1.2.3}
 BuildRequires: mysql-devel >= 5
@@ -219,8 +224,9 @@ BuildRequires:      mythes-devel >= 1.2
 BuildRequires: neon-devel >= 0.31.2
 BuildRequires: nspr-devel >= 1:4.8
 BuildRequires: nss-devel >= 1:3.10
+BuildRequires: openjpeg2-devel >= 2
 BuildRequires: openldap-devel
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel >= 0.9.8
 BuildRequires: pango-devel >= 1:1.17.3
 BuildRequires: perl-Archive-Zip
 BuildRequires: perl-base >= 5
@@ -228,7 +234,7 @@ BuildRequires:      perl-devel >= 5
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: poppler-cpp-devel >= 0.12.0
 BuildRequires: poppler-devel >= 0.12.0
-%{?with_pgsql:BuildRequires:   postgresql-devel}
+%{?with_pgsql:BuildRequires:   postgresql-devel >= 9.0}
 BuildRequires: python3 >= 1:3.3
 BuildRequires: python3-devel >= 1:3.3
 BuildRequires: python3-lxml
@@ -242,10 +248,9 @@ BuildRequires:     sed >= 4.0
 BuildRequires: startup-notification-devel >= 0.5
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
 BuildRequires: tar >= 1:1.22
-BuildRequires: ucpp
 BuildRequires: unixODBC-devel >= 2.2.12-2
 BuildRequires: unzip
-BuildRequires: xmlsec1-nss-devel >= 1.2.28
+BuildRequires: xmlsec1-nss-devel >= 1.2.35
 BuildRequires: xorg-font-font-adobe-utopia-type1
 BuildRequires: xorg-lib-libICE-devel
 BuildRequires: xorg-lib-libSM-devel
@@ -284,6 +289,16 @@ BuildRequires:     qt5-build >= %{qt5_ver}
 BuildRequires: qt5-qmake >= %{qt5_ver}
 BuildRequires: xcb-util-wm-devel
 %endif
+%if %{with qt6}
+BuildRequires: Qt6Core-devel >= %{qt6_ver}
+BuildRequires: Qt6Gui-devel >= %{qt6_ver}
+BuildRequires: Qt6Network-devel >= %{qt6_ver}
+BuildRequires: Qt6Widgets-devel >= %{qt6_ver}
+BuildRequires: libxcb-devel
+BuildRequires: qt6-build >= %{qt6_ver}
+BuildRequires: qt6-qmake >= %{qt6_ver}
+BuildRequires: xcb-util-wm-devel
+%endif
 # contains (dlopened) *.so libs
 BuildConflicts:        java-gcj-compat
 Requires:      %{name}-base = %{version}-%{release}
@@ -375,6 +390,20 @@ LibreOffice productivity suite - GTK+ 3 Interface.
 %description libs-gtk3 -l pl.UTF-8
 Pakiet biurowy LibreOffice - Interfejs GTK+ 3.
 
+%package libs-gtk4
+Summary:       LibreOffice GTK 4 Interface
+Summary(pl.UTF-8):     Interfejs GTK 4 dla LibreOffice
+Group:         X11/Libraries
+Requires:      %{name}-core = %{version}-%{release}
+Requires:      glib2 >= 1:2.38
+Requires:      gtk4 >= 4
+
+%description libs-gtk4
+LibreOffice productivity suite - GTK 4 Interface.
+
+%description libs-gtk4 -l pl.UTF-8
+Pakiet biurowy LibreOffice - Interfejs GTK 4.
+
 %package libs-qt5
 Summary:       LibreOffice Qt5 Interface
 Summary(pl.UTF-8):     Interfejs Qt5 dla LibreOffice
@@ -392,6 +421,18 @@ LibreOffice productivity suite - Qt5 Interface.
 %description libs-qt5 -l pl.UTF-8
 Pakiet biurowy LibreOffice - Interfejs Qt5.
 
+%package libs-qt6
+Summary:       LibreOffice Qt6 Interface
+Summary(pl.UTF-8):     Interfejs Qt6 dla LibreOffice
+Group:         X11/Libraries
+Requires:      %{name}-core = %{version}-%{release}
+
+%description libs-qt6
+LibreOffice productivity suite - Qt6 Interface.
+
+%description libs-qt6 -l pl.UTF-8
+Pakiet biurowy LibreOffice - Interfejs Qt6.
+
 %package core
 Summary:       Core modules for LibreOffice
 Summary(pl.UTF-8):     Podstawowe moduły dla LibreOffice
@@ -401,16 +442,16 @@ Requires(post,postun):    gtk-update-icon-cache
 Requires(post,postun): shared-mime-info
 Requires:      %{name}-ure = %{version}-%{release}
 %{?with_firebird:Requires:     Firebird-lib >= 3.0.0.0}
-Requires:      cairo >= 1.8.0
+Requires:      cairo >= 1.12.0
 Requires:      clucene-core >= 2.3
-Requires:      curl-libs >= 7.19.4
+Requires:      curl-libs >= 7.68.0
 Requires:      dconf >= 0.15.2
 Requires:      fontconfig >= 2.4.1
 Requires:      fonts-TTF-OpenSymbol
-Requires:      freetype >= 1:2.2.0
+Requires:      freetype >= 1:2.8.1
 Requires:      glib2 >= 1:2.38
 Requires:      graphite2 >= 0.9.3
-Requires:      harfbuzz-icu >= 0.9.42
+Requires:      harfbuzz-icu >= 5.1.0
 Requires:      hicolor-icon-theme
 %{?with_system_beanshell:Requires: java-beanshell}
 %{?with_system_hsqldb:Requires: java-hsqldb}
@@ -418,18 +459,19 @@ Requires: hicolor-icon-theme
 Requires:      libepoxy >= 1.2
 Requires:      libexttextcat >= 3.4.1
 Requires:      liblangtag >= 0.4.0
-Requires:      libmwaw >= 0.3.1
+Requires:      libmwaw >= 0.3.21
 Requires:      libodfgen >= 0.1.1
 Requires:      libpagemaker >= 0.0.2
 Requires:      libraptor2 >= 2.0.7
 Requires:      librevenge >= 0.0.1
+Requires:      libstaroffice >= 0.0.7
 Requires:      mktemp
 Requires:      neon >= 0.31.2
 Requires:      nspr >= 1:4.8
 Requires:      nss >= 1:3.10
 Requires:      redland >= 1.0.16
 Requires:      sed
-Requires:      xmlsec1-nss >= 1.2.28
+Requires:      xmlsec1-nss >= 1.2.35
 Requires:      xorg-lib-libXrandr >= 1.2
 #Suggests: chkfontpath
 Obsoletes:     libreoffice-binfilter < 4.0.0.0
@@ -600,7 +642,8 @@ Requires(post,postun):      desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name}-core = %{version}-%{release}
 Requires:      hicolor-icon-theme
-Requires:      libwps >= 0.4.10
+Requires:      libe-book >= 0.1.2
+Requires:      libwps >= 0.4.12
 Obsoletes:     openoffice.org-writer < 1:4
 
 %description writer
@@ -632,8 +675,8 @@ Requires(post,postun):      desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name}-core = %{version}-%{release}
 Requires:      hicolor-icon-theme
-Requires:      libetonyek >= 0.1.4
-Requires:      libwps >= 0.4.10
+Requires:      libetonyek >= 0.1.10
+Requires:      libwps >= 0.4.12
 Requires:      lp_solve >= 5.5
 Obsoletes:     openoffice.org-calc < 1:4
 
@@ -667,7 +710,7 @@ Requires(post,postun):      desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name}-core = %{version}-%{release}
 Requires:      hicolor-icon-theme
-Requires:      libetonyek >= 0.1.4
+Requires:      libetonyek >= 0.1.10
 Obsoletes:     libreoffice-presentation-minimizer < 4.2.0.0
 Obsoletes:     libreoffice-presenter-screen < 4.0.0.0-1
 Obsoletes:     openoffice.org-impress < 1:4
@@ -2893,12 +2936,6 @@ oraz narzędzie ui-previewer do sprawdzania wyglądu okien dialogowych.
 %prep
 %setup -q -a1 -a2 -a3
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 for dir in *-%{version}; do
        [ -f $dir/ChangeLog ] && %{__mv} $dir/ChangeLog ChangeLog-$dir
@@ -2927,8 +2964,6 @@ cp -p$l %{SOURCE33} ext_sources
 %endif
 :> src.downloaded
 
-cp -p$l %{SOURCE34} external/skia
-
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
 if [ ! -f /proc/cpuinfo ]; then
@@ -2995,12 +3030,15 @@ export PATH=$PATH:%{_libdir}/interbase/bin
        --enable-gio \
        --enable-gstreamer-1-0 \
        %{!?with_gtk3:--disable-gtk3} \
+       %{?with_gtk4:--enable-gtk4} \
+       %{?with_introspection:--enable-introspection} \
        %{?with_kde5:--enable-kf5} \
        --disable-odk \
        --enable-pdfimport \
        %{__enable_disable pgsql postgresql-sdbc} \
        --enable-python=system \
        %{?with_qt5:--enable-qt5} \
+       %{?with_qt6:--enable-qt6} \
        --enable-release-build \
        --enable-report-builder \
        --enable-scripting-beanshell \
@@ -3026,7 +3064,7 @@ export PATH=$PATH:%{_libdir}/interbase/bin
        %{!?with_system_coinmp:--without-system-coinmp} \
        %{?with_system_hsqldb:--with-system-hsqldb} \
        %{!?with_system_hunspell:--without-system-hunspell} \
-       --with-system-ucpp \
+       --without-system-libfixmath \
        --with-vendor="%{distribution}" \
        --with-x \
 %if 0%{?debug:1}
@@ -3055,7 +3093,8 @@ export ARCH_FLAGS_OPT="$SAFE_CFLAGS"
 # UTF-8 locale to ensure gettext stdin/stdout handling
 export LC_ALL=C.UTF-8
 
-%{__make} -j1 verbose=true build-nocheck
+%{__make} -j1 verbose=true build
+#-nocheck
 
 %if %{with tests}
 %{__make} -j1 verbose=true check
@@ -3338,6 +3377,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libClp.so.1
 %attr(755,root,root) %{_libdir}/%{name}/program/libCoinMP.so.1
 %attr(755,root,root) %{_libdir}/%{name}/program/libCoinUtils.so.3
+%attr(755,root,root) %{_libdir}/%{name}/program/libLanguageToollo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libOsi.so.1
 %attr(755,root,root) %{_libdir}/%{name}/program/libOsiClp.so.1
 %attr(755,root,root) %{_libdir}/%{name}/program/libacclo.so
@@ -3374,6 +3414,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libdict_ja.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libdict_zh.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libdlgprovlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdrawinglayercorelo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libdrawinglayerlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libeditenglo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libembobj.so
@@ -3438,7 +3479,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libsdbc2.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsdbtlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsddlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libsdfiltlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsdlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsduilo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libsfxlo.so
@@ -3507,6 +3547,10 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/senddoc
 %attr(755,root,root) %{_libdir}/%{name}/program/uri-encode
 
+# without system orcus
+%attr(755,root,root) %{_libdir}/%{name}/program/liborcus-0.17.so.0
+%attr(755,root,root) %{_libdir}/%{name}/program/liborcus-parser-0.17.so.0
+
 %if %{with java}
 %attr(755,root,root) %{_libdir}/%{name}/program/libhsqldb.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libjdbclo.so
@@ -3616,7 +3660,9 @@ fi
 %{_datadir}/%{name}/share/config/images_breeze_dark_svg.zip
 %{_datadir}/%{name}/share/config/images_breeze_svg.zip
 %{_datadir}/%{name}/share/config/images_colibre.zip
+%{_datadir}/%{name}/share/config/images_colibre_dark.zip
 %{_datadir}/%{name}/share/config/images_colibre_svg.zip
+%{_datadir}/%{name}/share/config/images_colibre_dark_svg.zip
 %{_datadir}/%{name}/share/config/images_elementary.zip
 %{_datadir}/%{name}/share/config/images_elementary_svg.zip
 %{_datadir}/%{name}/share/config/images_karasa_jaga.zip
@@ -3697,9 +3743,7 @@ fi
 %{_datadir}/%{name}/share/config/wizard
 %dir %{_datadir}/%{name}/share/dtd
 %{_datadir}/%{name}/share/dtd/officedocument
-%{_datadir}/%{name}/share/emojiconfig
 %dir %{_datadir}/%{name}/share/extensions
-%{_datadir}/%{name}/share/extensions/package.txt
 %{_datadir}/%{name}/share/filter
 %{_datadir}/%{name}/share/fonts
 %{_datadir}/%{name}/share/gallery
@@ -3732,6 +3776,7 @@ fi
 %dir %{_datadir}/%{name}/share/template/common
 %{_datadir}/%{name}/share/template/common/draw
 %{_datadir}/%{name}/share/template/common/internal
+%dir %{_datadir}/%{name}/share/template/common/l10n
 %{_datadir}/%{name}/share/template/common/officorr
 %{_datadir}/%{name}/share/template/common/offimisc
 %{_datadir}/%{name}/share/template/common/personal
@@ -3798,7 +3843,6 @@ fi
 %{_iconsdir}/hicolor/*/apps/libreoffice-chart.png
 %{_iconsdir}/hicolor/*/apps/libreoffice-chart.svg
 %{_iconsdir}/hicolor/*/apps/libreoffice-basic.svg
-%{_iconsdir}/hicolor/*/apps/libreoffice-extension.svg
 
 %{_desktopdir}/libreoffice-startcenter.desktop
 %{_iconsdir}/hicolor/*/apps/libreoffice-startcenter.png
@@ -3826,12 +3870,25 @@ fi
 #%{_datadir}/gir-1.0/LOKDocView-0.1.gir
 %endif
 
+%if %{with gtk4}
+%files libs-gtk4
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/program/libavmediagtk.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_gtk4lo.so
+%endif
+
 %if %{with qt5}
 %files libs-qt5
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_qt5*.so
 %endif
 
+%if %{with qt6}
+%files libs-qt6
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_qt6lo.so
+%endif
+
 %files base
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/lobase
@@ -4030,7 +4087,6 @@ fi
 %files ure
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/program/regmerge
 %attr(755,root,root) %{_libdir}/%{name}/program/regview
 %attr(755,root,root) %{_libdir}/%{name}/program/uno
 %attr(755,root,root) %{_libdir}/%{name}/program/uno.bin
@@ -4521,6 +4577,7 @@ fi
 
 %files i18n-zh_CN -f zh_CN.lang
 %defattr(644,root,root,755)
+%{_datadir}/%{name}/share/template/common/l10n/zh_CN_ott_normal.ott
 
 %files i18n-zh_TW -f zh_TW.lang
 %defattr(644,root,root,755)

diff --git a/pld-skia-patches.patch b/pld-skia-patches.patch
deleted file mode 100644 (file)
index 4c9f923..0000000
--- a/pld-skia-patches.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk.orig     2021-08-10 19:27:48.000000000 +0200
-+++ libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk  2021-08-12 18:09:22.813517161 +0200
-@@ -39,6 +39,7 @@
-     fix-warnings.patch.1 \
-     disable-freetype-colrv1.1 \
-     windows-libraries-system32.patch.1 \
-+    skia-freetype2.11.patch \
- 
- $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
- 

diff --git a/skia-freetype2.11.patch b/skia-freetype2.11.patch
deleted file mode 100644 (file)
index 97be7f2..0000000
--- a/skia-freetype2.11.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-03-01 15:53:09.178606791 +0100
-+++ skia/src/ports/SkFontHost_FreeType_common.cpp      2021-08-12 17:48:32.358901987 +0200
-@@ -665,8 +665,13 @@
-             canvas->drawPaint(paint);
-             break;
-         }
-+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
-+        case FT_COLR_PAINTFORMAT_TRANSFORM: {
-+            SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine);
-+#else
-         case FT_COLR_PAINTFORMAT_TRANSFORMED: {
-             SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
-+#endif
- 
-             canvas->concat(transform);
-             break;
-@@ -760,12 +765,20 @@
-             traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
-                                                  FT_COLOR_NO_ROOT_TRANSFORM);
-             break;
-+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
-+        case FT_COLR_PAINTFORMAT_TRANSFORM:
-+#else
-         case FT_COLR_PAINTFORMAT_TRANSFORMED:
-+#endif
-             canvas->saveLayer(nullptr, nullptr);
-             // Traverse / draw operation will apply transform.
-             colrv1_draw_paint(canvas, palette, face, paint);
-             traverse_result =
-+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
-+                    colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint);
-+#else
-                     colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint);
-+#endif
-             canvas->restore();
-             break;
-       case FT_COLR_PAINTFORMAT_ROTATE:

diff --git a/zxing1.4.patch b/zxing1.4.patch
deleted file mode 100644 (file)
index 505d54a..0000000
--- a/zxing1.4.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001
-From: "Brett T. Warden" <brett.t.warden@intel.com>
-Date: Fri, 30 Dec 2022 08:43:25 +0100
-Subject: Remove dependency on BitArray.h from zxing-1.2.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In zxing-1.4.0, numerous headers are no longer public. Rework the
-ConvertToSVGFormat method so it uses bitmatrix.get instead of
-bitmatrix.getRow, similar to the ToSVG method in zxing itself.
-
-See https://github.com/zxing-cpp/zxing-cpp/issues/361
-
-Change-Id: Ie25eb8f782e8799fbd57c24ef79bba92acf0f9ff
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144874
-Tested-by: René Engelhard <rene@debian.org>
-Reviewed-by: René Engelhard <rene@debian.org>
-Tested-by: Jenkins
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- cui/source/dialogs/QrCodeGenDialog.cxx | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-(limited to 'cui/source/dialogs/QrCodeGenDialog.cxx')
-
-diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx
-index f8cbac1d758d..817be7f21ede 100644
---- a/cui/source/dialogs/QrCodeGenDialog.cxx
-+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
-@@ -27,7 +27,6 @@
- #endif
- 
- #include <BarcodeFormat.h>
--#include <BitArray.h>
- #include <BitMatrix.h>
- #include <MultiFormatWriter.h>
- #include <TextUtfEncoding.h>
-@@ -79,7 +78,6 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix)
-     OStringBuffer sb;
-     const int width = bitmatrix.width();
-     const int height = bitmatrix.height();
--    ZXing::BitArray row(width);
-     sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-               "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 "
-               + OString::number(width) + " " + OString::number(height)
-@@ -87,10 +85,9 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix)
-                 "<path d=\"");
-     for (int i = 0; i < height; ++i)
-     {
--        bitmatrix.getRow(i, row);
-         for (int j = 0; j < width; ++j)
-         {
--            if (row.get(j))
-+            if (bitmatrix.get(j, i))
-             {
-                 sb.append("M" + OString::number(j) + "," + OString::number(i) + "h1v1h-1z");
-             }
--- 
-cgit v1.2.1
-