update to 7.6.4.1 [release 7.6.4.1-1mamba;Mon Jan 08 2024]
This commit is contained in:
parent
4ba058200a
commit
18e9c13c72
@ -1,11 +0,0 @@
|
|||||||
--- libreoffice-5.1.1.1/xmloff/source/draw/ximp3dscene.cxx.orig 2016-03-16 18:40:03.810865813 +0100
|
|
||||||
+++ libreoffice-5.1.1.1/xmloff/source/draw/ximp3dscene.cxx 2016-03-16 18:40:54.423826654 +0100
|
|
||||||
@@ -66,7 +66,7 @@
|
|
||||||
{
|
|
||||||
::basegfx::B3DVector aVal;
|
|
||||||
SvXMLUnitConverter::convertB3DVector(aVal, sValue);
|
|
||||||
- if (!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ()))
|
|
||||||
+ if (!std::isnan(aVal.getX()) && !std::isnan(aVal.getY()) && !std::isnan(aVal.getZ()))
|
|
||||||
{
|
|
||||||
maDirection = aVal;
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- libreoffice-5.1.3.2/basic/qa/cppunit/test_scanner.cxx.orig 2016-05-29 13:05:46.867502168 +0200
|
|
||||||
+++ libreoffice-5.1.3.2/basic/qa/cppunit/test_scanner.cxx 2016-05-29 13:07:29.017540637 +0200
|
|
||||||
@@ -579,7 +579,7 @@
|
|
||||||
CPPUNIT_ASSERT(symbols.size() == 3);
|
|
||||||
CPPUNIT_ASSERT(symbols[0].number == 1.2);
|
|
||||||
CPPUNIT_ASSERT(symbols[0].type == SbxDOUBLE);
|
|
||||||
- CPPUNIT_ASSERT(rtl::math::round( symbols[1].number, 12) == rtl::math::round( .3, 12));
|
|
||||||
+ CPPUNIT_ASSERT_EQUAL(rtl::math::round( .3, 12), rtl::math::round( symbols[1].number, 12));
|
|
||||||
CPPUNIT_ASSERT(symbols[1].type == SbxDOUBLE);
|
|
||||||
CPPUNIT_ASSERT(symbols[2].text == cr);
|
|
||||||
CPPUNIT_ASSERT(errors == 1);
|
|
||||||
@ -1,145 +0,0 @@
|
|||||||
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
|
|
||||||
index ee00452e5..c5ef154ba 100644
|
|
||||||
--- a/forms/source/xforms/datatypes.hxx
|
|
||||||
+++ b/forms/source/xforms/datatypes.hxx
|
|
||||||
@@ -36,6 +36,8 @@
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
+using icu::RegexMatcher;
|
|
||||||
+
|
|
||||||
|
|
||||||
namespace xforms
|
|
||||||
{
|
|
||||||
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
|
|
||||||
index 69d317797..2b4c2b9bf 100644
|
|
||||||
--- a/i18npool/inc/collator_unicode.hxx
|
|
||||||
+++ b/i18npool/inc/collator_unicode.hxx
|
|
||||||
@@ -26,6 +26,8 @@
|
|
||||||
|
|
||||||
#include <unicode/tblcoll.h>
|
|
||||||
|
|
||||||
+using icu::RuleBasedCollator;
|
|
||||||
+
|
|
||||||
// ----------------------------------------------------
|
|
||||||
// class Collator_Unicode
|
|
||||||
// ----------------------------------------------------
|
|
||||||
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
|
|
||||||
index b4ca11117..7a7fb4f35 100644
|
|
||||||
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
|
|
||||||
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
#include <rtl/ustring.hxx>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
+using icu::BreakIterator;
|
|
||||||
+using icu::RuleBasedBreakIterator;
|
|
||||||
+
|
|
||||||
U_CDECL_BEGIN
|
|
||||||
extern const char OpenOffice_dat[];
|
|
||||||
U_CDECL_END
|
|
||||||
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
|
|
||||||
index 22b7ed9ae..08ac8f71a 100644
|
|
||||||
--- a/i18npool/source/collator/collator_unicode.cxx
|
|
||||||
+++ b/i18npool/source/collator/collator_unicode.cxx
|
|
||||||
@@ -29,6 +29,8 @@
|
|
||||||
#include <com/sun/star/i18n/CollatorOptions.hpp>
|
|
||||||
#include <cppuhelper/supportsservice.hxx>
|
|
||||||
|
|
||||||
+using icu::Collator;
|
|
||||||
+
|
|
||||||
using namespace ::com::sun::star;
|
|
||||||
using namespace ::com::sun::star::i18n;
|
|
||||||
using namespace ::com::sun::star::lang;
|
|
||||||
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
|
|
||||||
index 7d795b5af..6d70106dd 100644
|
|
||||||
--- a/i18npool/source/collator/gencoll_rule.cxx
|
|
||||||
+++ b/i18npool/source/collator/gencoll_rule.cxx
|
|
||||||
@@ -31,6 +31,8 @@
|
|
||||||
|
|
||||||
#include <unicode/tblcoll.h>
|
|
||||||
|
|
||||||
+using icu::RuleBasedCollator;
|
|
||||||
+
|
|
||||||
/* Main Procedure */
|
|
||||||
|
|
||||||
void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len)
|
|
||||||
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
|
|
||||||
index a3e7d4ab6..b819d1859 100644
|
|
||||||
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
|
|
||||||
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
|
|
||||||
@@ -29,6 +29,8 @@
|
|
||||||
#include <unicode/normlzr.h>
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
+using icu::NumberFormat;
|
|
||||||
+
|
|
||||||
using namespace ::com::sun::star::i18n;
|
|
||||||
using namespace ::com::sun::star::uno;
|
|
||||||
using namespace ::com::sun::star;
|
|
||||||
diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
|
|
||||||
index 0ddfe645a..92759989f 100644
|
|
||||||
--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
|
|
||||||
+++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
|
|
||||||
@@ -12,6 +12,8 @@
|
|
||||||
#include <unicode/translit.h>
|
|
||||||
#include <unicode/uchar.h>
|
|
||||||
|
|
||||||
+using icu::UnicodeString;
|
|
||||||
+
|
|
||||||
namespace i18npool {
|
|
||||||
|
|
||||||
ignoreDiacritics_CTL::ignoreDiacritics_CTL()
|
|
||||||
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
|
|
||||||
index 0173a4ad5..e937c070e 100644
|
|
||||||
--- a/i18nutil/source/utility/unicode.cxx
|
|
||||||
+++ b/i18nutil/source/utility/unicode.cxx
|
|
||||||
@@ -34,6 +34,9 @@
|
|
||||||
// which (obviously) breaks UnicodeType::CURRENCY_SYMBOL
|
|
||||||
#undef CURRENCY_SYMBOL
|
|
||||||
|
|
||||||
+using icu::NumberFormat;
|
|
||||||
+using icu::UnicodeString;
|
|
||||||
+
|
|
||||||
using namespace ::com::sun::star::i18n;
|
|
||||||
|
|
||||||
template<class L, typename T>
|
|
||||||
diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx
|
|
||||||
index 47d202412..c54f1d401 100644
|
|
||||||
--- a/lotuswordpro/source/filter/localtime.cxx
|
|
||||||
+++ b/lotuswordpro/source/filter/localtime.cxx
|
|
||||||
@@ -57,6 +57,8 @@
|
|
||||||
#include <limits.h>
|
|
||||||
#include <unicode/timezone.h>
|
|
||||||
|
|
||||||
+using icu::TimeZone;
|
|
||||||
+
|
|
||||||
const long DAY_SEC =24 * 60 * 60;
|
|
||||||
const long YEAR_SEC = 365 * DAY_SEC;
|
|
||||||
const long FOURYEAR_SEC = 4 * YEAR_SEC + DAY_SEC;
|
|
||||||
diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
|
|
||||||
index b81ffed22..e7b2523f9 100644
|
|
||||||
--- a/opencl/source/openclconfig.cxx
|
|
||||||
+++ b/opencl/source/openclconfig.cxx
|
|
||||||
@@ -17,6 +17,8 @@
|
|
||||||
#include <sal/log.hxx>
|
|
||||||
#include <sal/types.h>
|
|
||||||
|
|
||||||
+using icu::RegexMatcher;
|
|
||||||
+
|
|
||||||
OpenCLConfig::OpenCLConfig() :
|
|
||||||
mbUseOpenCL(true)
|
|
||||||
{
|
|
||||||
diff --git a/vcl/inc/scrptrun.h b/vcl/inc/scrptrun.h
|
|
||||||
index cbe151df4..80faee12c 100644
|
|
||||||
--- a/vcl/inc/scrptrun.h
|
|
||||||
+++ b/vcl/inc/scrptrun.h
|
|
||||||
@@ -45,6 +45,8 @@
|
|
||||||
#include <unicode/uscript.h>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
+using icu::UObject;
|
|
||||||
+
|
|
||||||
namespace vcl {
|
|
||||||
|
|
||||||
struct ParenStackEntry
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
From 5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa Mon Sep 17 00:00:00 2001
|
|
||||||
From: Louis Sautier <sautier.louis@gmail.com>
|
|
||||||
Date: Sun, 10 Jun 2018 12:25:18 +0200
|
|
||||||
Subject: Fix build with GLM 0.9.9.0, tdf#118070
|
|
||||||
|
|
||||||
One of the test files was forgotten in 953c4add8fd76d88f49a81ae4c21a1fdcc007e57
|
|
||||||
|
|
||||||
Change-Id: I0315433c688ff7edb2ba599bbef203cac9de3022
|
|
||||||
Reviewed-on: https://gerrit.libreoffice.org/55554
|
|
||||||
Reviewed-by: Rene Engelhard <rene@debian.org>
|
|
||||||
Tested-by: Rene Engelhard <rene@debian.org>
|
|
||||||
---
|
|
||||||
vcl/Executable_icontest.mk | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
|
|
||||||
index ce16330..8c917b7 100644
|
|
||||||
--- a/vcl/Executable_icontest.mk
|
|
||||||
+++ b/vcl/Executable_icontest.mk
|
|
||||||
@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
|
|
||||||
))
|
|
||||||
endif
|
|
||||||
|
|
||||||
+ifeq ($(SYSTEM_GLM),TRUE)
|
|
||||||
+$(eval $(call gb_Executable_add_defs,icontest,\
|
|
||||||
+ -DGLM_ENABLE_EXPERIMENTAL \
|
|
||||||
+))
|
|
||||||
+endif
|
|
||||||
+
|
|
||||||
$(eval $(call gb_Executable_use_api,icontest,\
|
|
||||||
offapi \
|
|
||||||
udkapi \
|
|
||||||
--
|
|
||||||
cgit v1.1
|
|
||||||
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails:
|
|
||||||
|
|
||||||
sfx2/source/appl/shutdownicon.cxx:170:12: error: no viable conversion from returned value of type 'boost::logic::tribool' to function return type 'bool'
|
|
||||||
return loaded;
|
|
||||||
^~~~~~
|
|
||||||
|
|
||||||
--- a/sfx2/source/appl/shutdownicon.cxx 2018-06-19 22:27:30 UTC
|
|
||||||
+++ b/sfx2/source/appl/shutdownicon.cxx
|
|
||||||
@@ -167,7 +167,7 @@ bool LoadModule()
|
|
||||||
#endif // ENABLE_QUICKSTART_APPLET
|
|
||||||
}
|
|
||||||
assert(!boost::logic::indeterminate(loaded));
|
|
||||||
- return loaded;
|
|
||||||
+ return bool{loaded};
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,70 +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);
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- libreoffice-6.4.3.2/sal/qa/osl/file/osl_File.cxx.orig 2020-04-18 10:46:28.088000000 +0200
|
|
||||||
+++ libreoffice-6.4.3.2/sal/qa/osl/file/osl_File.cxx 2020-04-18 10:47:12.633000000 +0200
|
|
||||||
@@ -264,7 +264,7 @@
|
|
||||||
|
|
||||||
OString strError = "In deleteTestDirectory function: remove Directory " +
|
|
||||||
OUStringToOString(aPathURL, RTL_TEXTENCODING_ASCII_US);
|
|
||||||
- CPPUNIT_ASSERT_MESSAGE(strError.getStr(), (osl::FileBase::E_None == nError) || (nError == osl::FileBase::E_NOENT));
|
|
||||||
+ //CPPUNIT_ASSERT_MESSAGE(strError.getStr(), (osl::FileBase::E_None == nError) || (nError == osl::FileBase::E_NOENT));
|
|
||||||
}
|
|
||||||
|
|
||||||
/** delete a temp test directory using OUString name of full qualified URL or system path in a base directory.
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
||||||
index e9c2a407c279..16ad04bf660a 100644
|
|
||||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
||||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
||||||
@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
|
|
||||||
if (!(pAction && pAction->getKind() == actionURI))
|
|
||||||
return;
|
|
||||||
|
|
||||||
-#if POPPLER_CHECK_VERSION(0, 72, 0)
|
|
||||||
+#if POPPLER_CHECK_VERSION(0, 86, 0)
|
|
||||||
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
|
|
||||||
+#elif POPPLER_CHECK_VERSION(0, 72, 0)
|
|
||||||
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
|
|
||||||
#else
|
|
||||||
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
|
|
||||||
Date: 2021-08-23
|
|
||||||
Initial Package Version: 7.2.0.4
|
|
||||||
Upstream Status: Unknown
|
|
||||||
Origin: Marty Jack
|
|
||||||
Description: Corrects automatically downloaded skia package for current freetype
|
|
||||||
|
|
||||||
diff -Naur libreoffice-7.2.0.4.orig/external/skia/freetype_2.11.patch libreoffice-7.2.0.4/external/skia/freetype_2.11.patch
|
|
||||||
--- libreoffice-7.2.0.4.orig/external/skia/freetype_2.11.patch 1969-12-31 18:00:00.000000000 -0600
|
|
||||||
+++ libreoffice-7.2.0.4/external/skia/freetype_2.11.patch 2021-08-23 10:28:43.646193278 -0500
|
|
||||||
@@ -0,0 +1,29 @@
|
|
||||||
+diff -Naur skia.orig/src/ports/SkFontHost_FreeType_common.cpp skia/src/ports/SkFontHost_FreeType_common.cpp
|
|
||||||
+--- skia.orig/src/ports/SkFontHost_FreeType_common.cpp 2021-03-01 09:53:09.178606791 -0500
|
|
||||||
++++ skia/src/ports/SkFontHost_FreeType_common.cpp 2021-08-19 10:41:10.974582934 -0400
|
|
||||||
+@@ -665,8 +665,8 @@
|
|
||||||
+ canvas->drawPaint(paint);
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+- case FT_COLR_PAINTFORMAT_TRANSFORMED: {
|
|
||||||
+- SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
|
|
||||||
++ case FT_COLR_PAINTFORMAT_TRANSFORM: {
|
|
||||||
++ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine);
|
|
||||||
+
|
|
||||||
+ canvas->concat(transform);
|
|
||||||
+ break;
|
|
||||||
+@@ -760,12 +760,12 @@
|
|
||||||
+ traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
|
|
||||||
+ FT_COLOR_NO_ROOT_TRANSFORM);
|
|
||||||
+ break;
|
|
||||||
+- case FT_COLR_PAINTFORMAT_TRANSFORMED:
|
|
||||||
++ case FT_COLR_PAINTFORMAT_TRANSFORM:
|
|
||||||
+ canvas->saveLayer(nullptr, nullptr);
|
|
||||||
+ // Traverse / draw operation will apply transform.
|
|
||||||
+ colrv1_draw_paint(canvas, palette, face, paint);
|
|
||||||
+ traverse_result =
|
|
||||||
+- colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint);
|
|
||||||
++ colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint);
|
|
||||||
+ canvas->restore();
|
|
||||||
+ break;
|
|
||||||
+ case FT_COLR_PAINTFORMAT_ROTATE:
|
|
||||||
diff -Naur libreoffice-7.2.0.4.orig/external/skia/UnpackedTarball_skia.mk libreoffice-7.2.0.4/external/skia/UnpackedTarball_skia.mk
|
|
||||||
--- libreoffice-7.2.0.4.orig/external/skia/UnpackedTarball_skia.mk 2021-08-16 14:56:28.000000000 -0500
|
|
||||||
+++ libreoffice-7.2.0.4/external/skia/UnpackedTarball_skia.mk 2021-08-23 10:26:46.418807295 -0500
|
|
||||||
@@ -14,6 +14,7 @@
|
|
||||||
# * c++20.patch.0 has been reported upstream at
|
|
||||||
# <https://groups.google.com/forum/#!topic/skia-discuss/pYZQq_sLnv8> "C++20 operator== issue":
|
|
||||||
skia_patches := \
|
|
||||||
+ freetype_2.11.patch \
|
|
||||||
fix-pch.patch.1 \
|
|
||||||
fix-ddi.patch \
|
|
||||||
make-api-visible.patch.1 \
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
|
||||||
index ad6320139..e5f6d9c68 100644
|
|
||||||
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
|
||||||
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
|
|
||||||
@@ -138,6 +138,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::make_unique<GooString>(pFileName),
|
|
||||||
+ GooString(pOwnerPasswordStr),
|
|
||||||
+ GooString(pUserPasswordStr) );
|
|
||||||
+
|
|
||||||
+ PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName),
|
|
||||||
+ GooString(pOwnerPasswordStr),
|
|
||||||
+ GooString(pUserPasswordStr) );
|
|
||||||
+#else
|
|
||||||
PDFDoc aDoc( pFileName,
|
|
||||||
pOwnerPasswordStr,
|
|
||||||
pUserPasswordStr );
|
|
||||||
@@ -145,6 +154,7 @@ int main(int argc, char **argv)
|
|
||||||
PDFDoc aErrDoc( pErrFileName,
|
|
||||||
pOwnerPasswordStr,
|
|
||||||
pUserPasswordStr );
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
// Check various permissions for aDoc.
|
|
||||||
PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc;
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
# Patch from FreeBSD (https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd)
|
|
||||||
|
|
||||||
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2022-04-26 16:11:01 UTC
|
|
||||||
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
||||||
@@ -474,11 +474,17 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* g
|
|
||||||
{
|
|
||||||
// TODO(P3): Unfortunately, need to read stream twice, since
|
|
||||||
// we must write byte count to stdout before
|
|
||||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
|
||||||
char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
|
|
||||||
+#else
|
|
||||||
+ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
|
|
||||||
+#endif
|
|
||||||
if( pBuf )
|
|
||||||
{
|
|
||||||
aNewFont.isEmbedded = true;
|
|
||||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
|
||||||
gfree(pBuf);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -492,21 +498,32 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) cons
|
|
||||||
return;
|
|
||||||
|
|
||||||
int nSize = 0;
|
|
||||||
- char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
|
|
||||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
|
||||||
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
|
|
||||||
+#else
|
|
||||||
+ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
|
|
||||||
+#endif
|
|
||||||
if( !pBuf )
|
|
||||||
return;
|
|
||||||
|
|
||||||
// ---sync point--- see SYNC STREAMS above
|
|
||||||
fflush(stdout);
|
|
||||||
-
|
|
||||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
|
||||||
if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
|
|
||||||
+#else
|
|
||||||
+ if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
- gfree(pBuf);
|
|
||||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
|
||||||
+ gfree(pBuf);
|
|
||||||
+#endif
|
|
||||||
exit(1); // error
|
|
||||||
}
|
|
||||||
// ---sync point--- see SYNC STREAMS above
|
|
||||||
fflush(g_binary_out);
|
|
||||||
- gfree(pBuf);
|
|
||||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
|
||||||
+ gfree(pBuf);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
#if POPPLER_CHECK_VERSION(0, 83, 0)
|
|
||||||
@@ -759,7 +776,11 @@ void PDFOutDev::updateFont(GfxState *state)
|
|
||||||
{
|
|
||||||
assert(state);
|
|
||||||
|
|
||||||
+#if !POPPLER_CHECK_VERSION(22, 3, 0)
|
|
||||||
GfxFont *gfxFont = state->getFont();
|
|
||||||
+#else
|
|
||||||
+ GfxFont *gfxFont = state->getFont().get();
|
|
||||||
+#endif
|
|
||||||
if( !gfxFont )
|
|
||||||
return;
|
|
||||||
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index e5d202b..94f1224 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -12537,12 +12537,11 @@
|
|
||||||
# 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 >= 1.14 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"
|
|
||||||
@ -1,59 +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(-)
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
218
libreoffice-7.6.4.1-icu-74.2.patch
Normal file
218
libreoffice-7.6.4.1-icu-74.2.patch
Normal file
@ -0,0 +1,218 @@
|
|||||||
|
https://bugs.gentoo.org/917618
|
||||||
|
https://bugs.documentfoundation.org/show_bug.cgi?id=158108
|
||||||
|
|
||||||
|
From bcd5d851ebe91fc22edd3ea92be4a674bd13acba Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alfred Wingate <parona@protonmail.com>
|
||||||
|
Date: Mon, 20 Nov 2023 14:47:28 +0200
|
||||||
|
Subject: [PATCH] Remove use of the now removed LBCMNoChain options
|
||||||
|
|
||||||
|
* This change removes its use and explicitly prevents chaining where
|
||||||
|
the rule would have applied.
|
||||||
|
|
||||||
|
https://github.com/unicode-org/icu/commit/84e47620692be90950d090f2f4722494b020ad96
|
||||||
|
https://github.com/unicode-org/icu/commit/9d9256f3b792100cda697c7bcf52bacfbc3bca87
|
||||||
|
|
||||||
|
Signed-off-by: Alfred Wingate <parona@protonmail.com>
|
||||||
|
--- a/i18npool/source/breakiterator/data/line.txt
|
||||||
|
+++ b/i18npool/source/breakiterator/data/line.txt
|
||||||
|
@@ -14,7 +14,6 @@
|
||||||
|
#
|
||||||
|
|
||||||
|
!!chain;
|
||||||
|
-!!LBCMNoChain;
|
||||||
|
|
||||||
|
|
||||||
|
!!lookAheadHardBreak;
|
||||||
|
@@ -206,13 +205,13 @@ $CR $LF {100};
|
||||||
|
#
|
||||||
|
$LB4NonBreaks? $LB4Breaks {100}; # LB 5 do not break before hard breaks.
|
||||||
|
$CAN_CM $CM* $LB4Breaks {100};
|
||||||
|
-$CM+ $LB4Breaks {100};
|
||||||
|
+^$CM+ $LB4Breaks {100};
|
||||||
|
|
||||||
|
# LB 7 x SP
|
||||||
|
# x ZW
|
||||||
|
$LB4NonBreaks [$SP $ZW];
|
||||||
|
$CAN_CM $CM* [$SP $ZW];
|
||||||
|
-$CM+ [$SP $ZW];
|
||||||
|
+^$CM+ [$SP $ZW];
|
||||||
|
|
||||||
|
#
|
||||||
|
# LB 8 Break after zero width space
|
||||||
|
@@ -226,14 +225,14 @@ $LB8NonBreaks = [[$LB4NonBreaks] - [$ZW]];
|
||||||
|
# See definition of $CAN_CM.
|
||||||
|
|
||||||
|
$CAN_CM $CM+; # Stick together any combining sequences that don't match other rules.
|
||||||
|
-$CM+;
|
||||||
|
+^$CM+;
|
||||||
|
|
||||||
|
#
|
||||||
|
# LB 11 Do not break before or after WORD JOINER & related characters.
|
||||||
|
#
|
||||||
|
$CAN_CM $CM* $WJcm;
|
||||||
|
$LB8NonBreaks $WJcm;
|
||||||
|
-$CM+ $WJcm;
|
||||||
|
+^$CM+ $WJcm;
|
||||||
|
|
||||||
|
$WJcm [^$CAN_CM];
|
||||||
|
$WJcm $CAN_CM $CM*;
|
||||||
|
@@ -243,7 +242,7 @@ $WJcm $CAN_CM $CM*;
|
||||||
|
#
|
||||||
|
# (!SP) x GL
|
||||||
|
[$LB8NonBreaks-$SP] $CM* $GLcm;
|
||||||
|
-$CM+ $GLcm;
|
||||||
|
+^$CM+ $GLcm;
|
||||||
|
|
||||||
|
# GL x
|
||||||
|
$GLcm ($LB8Breaks | $SP);
|
||||||
|
@@ -260,19 +259,19 @@ $GLcm [$LB8NonBreaks-$SP] $CM*; # Don't let a combining mark go onto $CR, $B
|
||||||
|
#
|
||||||
|
$LB8NonBreaks $CL;
|
||||||
|
$CAN_CM $CM* $CL;
|
||||||
|
-$CM+ $CL; # by rule 10, stand-alone CM behaves as AL
|
||||||
|
+^$CM+ $CL; # by rule 10, stand-alone CM behaves as AL
|
||||||
|
|
||||||
|
$LB8NonBreaks $EX;
|
||||||
|
$CAN_CM $CM* $EX;
|
||||||
|
-$CM+ $EX; # by rule 10, stand-alone CM behaves as AL
|
||||||
|
+^$CM+ $EX; # by rule 10, stand-alone CM behaves as AL
|
||||||
|
|
||||||
|
$LB8NonBreaks $IS;
|
||||||
|
$CAN_CM $CM* $IS;
|
||||||
|
-$CM+ $IS; # by rule 10, stand-alone CM behaves as AL
|
||||||
|
+^$CM+ $IS; # by rule 10, stand-alone CM behaves as AL
|
||||||
|
|
||||||
|
$LB8NonBreaks $SY;
|
||||||
|
$CAN_CM $CM* $SY;
|
||||||
|
-$CM+ $SY; # by rule 10, stand-alone CM behaves as AL
|
||||||
|
+^$CM+ $SY; # by rule 10, stand-alone CM behaves as AL
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
@@ -302,7 +301,7 @@ $LB18Breaks = [$LB8Breaks $SP];
|
||||||
|
# LB 19
|
||||||
|
# x QU
|
||||||
|
$LB18NonBreaks $CM* $QUcm;
|
||||||
|
-$CM+ $QUcm;
|
||||||
|
+^$CM+ $QUcm;
|
||||||
|
|
||||||
|
# QU x
|
||||||
|
$QUcm .?;
|
||||||
|
@@ -331,7 +330,7 @@ $HLcm ($HYcm | $BAcm) [^$CB]?;
|
||||||
|
|
||||||
|
# LB 22
|
||||||
|
($ALcm | $HLcm) $INcm;
|
||||||
|
-$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL
|
||||||
|
+^$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL
|
||||||
|
$IDcm $INcm;
|
||||||
|
$INcm $INcm;
|
||||||
|
$NUcm $INcm;
|
||||||
|
@@ -341,7 +340,7 @@ $NUcm $INcm;
|
||||||
|
$IDcm $POcm;
|
||||||
|
$ALcm $NUcm; # includes $LB19
|
||||||
|
$HLcm $NUcm;
|
||||||
|
-$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL
|
||||||
|
+^$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL
|
||||||
|
$NUcm $ALcm;
|
||||||
|
$NUcm $HLcm;
|
||||||
|
|
||||||
|
@@ -373,7 +372,7 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
|
||||||
|
# LB 28 Do not break between alphabetics
|
||||||
|
#
|
||||||
|
($ALcm | $HLcm) ($ALcm | $HLcm);
|
||||||
|
-$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL
|
||||||
|
+^$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL
|
||||||
|
|
||||||
|
# LB 29
|
||||||
|
$IScm ($ALcm | $NUcm);
|
||||||
|
@@ -383,7 +382,7 @@ $IScm ($ALcm | $NUcm);
|
||||||
|
# and opening or closing punctuation
|
||||||
|
#
|
||||||
|
($ALcm | $HLcm | $NUcm) $OPcm;
|
||||||
|
-$CM+ $OPcm;
|
||||||
|
+^$CM+ $OPcm;
|
||||||
|
$CLcm ($ALcm | $HLcm | $NUcm);
|
||||||
|
|
||||||
|
#
|
||||||
|
@@ -393,32 +392,32 @@ $CLcm ($ALcm | $HLcm | $NUcm);
|
||||||
|
|
||||||
|
!!reverse;
|
||||||
|
|
||||||
|
-$CM+ $ALPlus;
|
||||||
|
-$CM+ $BA;
|
||||||
|
-$CM+ $BB;
|
||||||
|
-$CM+ $B2;
|
||||||
|
-$CM+ $CL;
|
||||||
|
-$CM+ $EX;
|
||||||
|
-$CM+ $GL;
|
||||||
|
-$CM+ $HL;
|
||||||
|
-$CM+ $HY;
|
||||||
|
-$CM+ $H2;
|
||||||
|
-$CM+ $H3;
|
||||||
|
-$CM+ $ID;
|
||||||
|
-$CM+ $IN;
|
||||||
|
-$CM+ $IS;
|
||||||
|
-$CM+ $JL;
|
||||||
|
-$CM+ $JV;
|
||||||
|
-$CM+ $JT;
|
||||||
|
-$CM+ $NS;
|
||||||
|
-$CM+ $NU;
|
||||||
|
-$CM+ $OP;
|
||||||
|
-$CM+ $PO;
|
||||||
|
-$CM+ $PR;
|
||||||
|
-$CM+ $QU;
|
||||||
|
-$CM+ $SY;
|
||||||
|
-$CM+ $WJ;
|
||||||
|
-$CM+;
|
||||||
|
+^$CM+ $ALPlus;
|
||||||
|
+^$CM+ $BA;
|
||||||
|
+^$CM+ $BB;
|
||||||
|
+^$CM+ $B2;
|
||||||
|
+^$CM+ $CL;
|
||||||
|
+^$CM+ $EX;
|
||||||
|
+^$CM+ $GL;
|
||||||
|
+^$CM+ $HL;
|
||||||
|
+^$CM+ $HY;
|
||||||
|
+^$CM+ $H2;
|
||||||
|
+^$CM+ $H3;
|
||||||
|
+^$CM+ $ID;
|
||||||
|
+^$CM+ $IN;
|
||||||
|
+^$CM+ $IS;
|
||||||
|
+^$CM+ $JL;
|
||||||
|
+^$CM+ $JV;
|
||||||
|
+^$CM+ $JT;
|
||||||
|
+^$CM+ $NS;
|
||||||
|
+^$CM+ $NU;
|
||||||
|
+^$CM+ $OP;
|
||||||
|
+^$CM+ $PO;
|
||||||
|
+^$CM+ $PR;
|
||||||
|
+^$CM+ $QU;
|
||||||
|
+^$CM+ $SY;
|
||||||
|
+^$CM+ $WJ;
|
||||||
|
+^$CM+;
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
@@ -468,7 +467,7 @@ $LF $CR;
|
||||||
|
# X $CM needs to behave like X, where X is not $SP or controls.
|
||||||
|
# $CM not covered by the above needs to behave like $AL
|
||||||
|
# Stick together any combining sequences that don't match other rules.
|
||||||
|
-$CM+ $CAN_CM;
|
||||||
|
+^$CM+ $CAN_CM;
|
||||||
|
|
||||||
|
|
||||||
|
# LB 11
|
||||||
|
@@ -606,8 +605,8 @@ $CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
|
||||||
|
!!safe_reverse;
|
||||||
|
|
||||||
|
# LB 7
|
||||||
|
-$CM+ [^$CM $BK $CR $LF $NL $ZW $SP];
|
||||||
|
-$CM+ $SP / .;
|
||||||
|
+^$CM+ [^$CM $BK $CR $LF $NL $ZW $SP];
|
||||||
|
+^$CM+ $SP / .;
|
||||||
|
|
||||||
|
# LB 9
|
||||||
|
$SP+ $CM* $OP;
|
||||||
|
--
|
||||||
|
2.42.1
|
||||||
|
|
||||||
301
libreoffice-7.6.4.1-libxml-2.12.patch
Normal file
301
libreoffice-7.6.4.1-libxml-2.12.patch
Normal file
@ -0,0 +1,301 @@
|
|||||||
|
From c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Miklos Vajna <vmiklos@collabora.com>
|
||||||
|
Date: Mon, 27 Nov 2023 08:02:59 +0100
|
||||||
|
Subject: tdf#158302 fix build against system-libxml-2.12
|
||||||
|
|
||||||
|
Seen in a fedora:40 container, using --with-system-libcmis,
|
||||||
|
--with-system-liblangtag and --with-system-xmlsec.
|
||||||
|
|
||||||
|
Change-Id: I9d748d3dc0b70dbfdfcb6b99c9ce8440bda6f326
|
||||||
|
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159980
|
||||||
|
Tested-by: Jenkins
|
||||||
|
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
||||||
|
---
|
||||||
|
drawinglayer/source/tools/primitive2dxmldump.cxx | 1 +
|
||||||
|
filter/source/xsltfilter/LibXSLTTransformer.cxx | 2 +-
|
||||||
|
helpcompiler/source/HelpLinker.cxx | 4 ++++
|
||||||
|
include/xmloff/xmltoken.hxx | 2 +-
|
||||||
|
sax/source/fastparser/fastparser.cxx | 2 +-
|
||||||
|
sc/source/core/tool/interpr7.cxx | 1 +
|
||||||
|
sc/source/filter/xml/XMLExportDataPilot.cxx | 2 +-
|
||||||
|
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2 +-
|
||||||
|
sc/source/filter/xml/xmlfilti.cxx | 6 +++---
|
||||||
|
unoxml/source/dom/attr.cxx | 1 +
|
||||||
|
unoxml/source/dom/document.cxx | 1 +
|
||||||
|
unoxml/source/dom/documentbuilder.cxx | 1 +
|
||||||
|
unoxml/source/dom/entity.cxx | 1 +
|
||||||
|
unoxml/source/xpath/xpathapi.cxx | 7 ++++++-
|
||||||
|
xmloff/source/core/xmltoken.cxx | 2 +-
|
||||||
|
xmloff/source/style/PageMasterStyleMap.cxx | 2 +-
|
||||||
|
xmlsecurity/inc/xmlsec-wrapper.h | 1 +
|
||||||
|
xmlsecurity/inc/xmlsec/saxhelper.hxx | 1 +
|
||||||
|
18 files changed, 28 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx
|
||||||
|
index 76aefec902ea..f3b9ef1bc919 100644
|
||||||
|
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
|
||||||
|
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
|
||||||
|
@@ -15,6 +15,7 @@
|
||||||
|
|
||||||
|
#include <math.h>
|
||||||
|
#include <memory>
|
||||||
|
+#include <libxml/parser.h>
|
||||||
|
#include <sal/log.hxx>
|
||||||
|
|
||||||
|
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
|
||||||
|
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
|
||||||
|
index 1a7c34805f1b..5e9a7c4bcd35 100644
|
||||||
|
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
|
||||||
|
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
|
||||||
|
@@ -333,7 +333,7 @@ namespace XSLT
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- xmlErrorPtr lastErr = xmlGetLastError();
|
||||||
|
+ const xmlError* lastErr = xmlGetLastError();
|
||||||
|
OUString msg;
|
||||||
|
if (lastErr)
|
||||||
|
msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8);
|
||||||
|
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
|
||||||
|
index 3d52834dbe6b..898a8b26392a 100644
|
||||||
|
--- a/helpcompiler/source/HelpLinker.cxx
|
||||||
|
+++ b/helpcompiler/source/HelpLinker.cxx
|
||||||
|
@@ -815,7 +815,11 @@ static const HelpProcessingException* GpXMLParsingException = nullptr;
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
|
||||||
|
+#if LIBXML_VERSION >= 21200
|
||||||
|
+static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError* error)
|
||||||
|
+#else
|
||||||
|
static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error)
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
std::string aErrorMsg = error->message;
|
||||||
|
std::string aXMLParsingFile;
|
||||||
|
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
|
||||||
|
index 4e6441841774..ba42fae4d035 100644
|
||||||
|
--- a/include/xmloff/xmltoken.hxx
|
||||||
|
+++ b/include/xmloff/xmltoken.hxx
|
||||||
|
@@ -744,7 +744,7 @@ namespace xmloff::token {
|
||||||
|
XML_EMBEDDED_VISIBLE_AREA,
|
||||||
|
XML_EMBOSSED,
|
||||||
|
XML_EMISSIVE_COLOR,
|
||||||
|
- XML_EMPTY,
|
||||||
|
+ XML_TOKEN_EMPTY,
|
||||||
|
XML_EMPTY_LINE_REFRESH,
|
||||||
|
XML_ENABLE_NUMBERING,
|
||||||
|
XML_ENABLED,
|
||||||
|
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
|
||||||
|
index ec8065016a12..e0338e053cf0 100644
|
||||||
|
--- a/sax/source/fastparser/fastparser.cxx
|
||||||
|
+++ b/sax/source/fastparser/fastparser.cxx
|
||||||
|
@@ -578,7 +578,7 @@ Event& Entity::getEvent( CallbackType aType )
|
||||||
|
OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, std::u16string_view sSystemId, sal_Int32 nLine )
|
||||||
|
{
|
||||||
|
const char* pMessage;
|
||||||
|
- xmlErrorPtr error = xmlCtxtGetLastError( ctxt );
|
||||||
|
+ const xmlError* error = xmlCtxtGetLastError( ctxt );
|
||||||
|
if( error && error->message )
|
||||||
|
pMessage = error->message;
|
||||||
|
else
|
||||||
|
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
|
||||||
|
index 352c7cf70e45..ecb4ea346396 100644
|
||||||
|
--- a/sc/source/core/tool/interpr7.cxx
|
||||||
|
+++ b/sc/source/core/tool/interpr7.cxx
|
||||||
|
@@ -31,6 +31,7 @@
|
||||||
|
#include <cstring>
|
||||||
|
#include <memory>
|
||||||
|
#include <string_view>
|
||||||
|
+#include <libxml/parser.h>
|
||||||
|
|
||||||
|
using namespace com::sun::star;
|
||||||
|
|
||||||
|
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
|
||||||
|
index da65bec0dab7..bd5f16d828ff 100644
|
||||||
|
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
|
||||||
|
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
|
||||||
|
@@ -123,7 +123,7 @@ void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, boo
|
||||||
|
|
||||||
|
if (aQueryEntry.IsQueryByEmpty())
|
||||||
|
{
|
||||||
|
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_EMPTY));
|
||||||
|
+ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_TOKEN_EMPTY));
|
||||||
|
}
|
||||||
|
else if (aQueryEntry.IsQueryByNonEmpty())
|
||||||
|
{
|
||||||
|
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
|
||||||
|
index 6905e02d651b..e4307065bd92 100644
|
||||||
|
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
|
||||||
|
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
|
||||||
|
@@ -376,7 +376,7 @@ private:
|
||||||
|
case SC_EQUAL:
|
||||||
|
{
|
||||||
|
if (rEntry.IsQueryByEmpty())
|
||||||
|
- return GetXMLToken(XML_EMPTY);
|
||||||
|
+ return GetXMLToken(XML_TOKEN_EMPTY);
|
||||||
|
else if (rEntry.IsQueryByNonEmpty())
|
||||||
|
return GetXMLToken(XML_NOEMPTY);
|
||||||
|
|
||||||
|
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
|
||||||
|
index 7585ce0c50fa..61f7cfe4a349 100644
|
||||||
|
--- a/sc/source/filter/xml/xmlfilti.cxx
|
||||||
|
+++ b/sc/source/filter/xml/xmlfilti.cxx
|
||||||
|
@@ -370,7 +370,7 @@ void ScXMLConditionContext::GetOperator(
|
||||||
|
rEntry.eOp = SC_BOTPERC;
|
||||||
|
else if (IsXMLToken(aOpStr, XML_BOTTOM_VALUES))
|
||||||
|
rEntry.eOp = SC_BOTVAL;
|
||||||
|
- else if (IsXMLToken(aOpStr, XML_EMPTY))
|
||||||
|
+ else if (IsXMLToken(aOpStr, XML_TOKEN_EMPTY))
|
||||||
|
rEntry.SetQueryByEmpty();
|
||||||
|
else if (aOpStr == u">")
|
||||||
|
rEntry.eOp = SC_GREATER;
|
||||||
|
@@ -422,7 +422,7 @@ void SAL_CALL ScXMLConditionContext::endFastElement( sal_Int32 /*nElement*/ )
|
||||||
|
if (maQueryItems.empty())
|
||||||
|
{
|
||||||
|
ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
|
||||||
|
- if (IsXMLToken(sOperator, XML_EMPTY))
|
||||||
|
+ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY))
|
||||||
|
return;
|
||||||
|
if (IsXMLToken(sDataType, XML_NUMBER))
|
||||||
|
{
|
||||||
|
@@ -753,7 +753,7 @@ void SAL_CALL ScXMLDPConditionContext::endFastElement( sal_Int32 /*nElement*/ )
|
||||||
|
else
|
||||||
|
aFilterField.eConnect = SC_AND;
|
||||||
|
pFilterContext->SetIsCaseSensitive(bIsCaseSensitive);
|
||||||
|
- if (IsXMLToken(sOperator, XML_EMPTY))
|
||||||
|
+ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY))
|
||||||
|
aFilterField.SetQueryByEmpty();
|
||||||
|
else if (IsXMLToken(sOperator, XML_NOEMPTY))
|
||||||
|
aFilterField.SetQueryByNonEmpty();
|
||||||
|
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
|
||||||
|
index dd974d910edb..d8d873cdf055 100644
|
||||||
|
--- a/unoxml/source/dom/attr.cxx
|
||||||
|
+++ b/unoxml/source/dom/attr.cxx
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
+#include <libxml/entities.h>
|
||||||
|
|
||||||
|
#include <osl/diagnose.h>
|
||||||
|
#include <sal/log.hxx>
|
||||||
|
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
|
||||||
|
index cb48bd1635f8..0825fc2cd7ed 100644
|
||||||
|
--- a/unoxml/source/dom/document.cxx
|
||||||
|
+++ b/unoxml/source/dom/document.cxx
|
||||||
|
@@ -41,6 +41,7 @@
|
||||||
|
#include <eventdispatcher.hxx>
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
+#include <libxml/xmlIO.h>
|
||||||
|
|
||||||
|
#include <osl/diagnose.h>
|
||||||
|
|
||||||
|
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
|
||||||
|
index c3cd7663d2fc..3898d58e4be4 100644
|
||||||
|
--- a/unoxml/source/dom/documentbuilder.cxx
|
||||||
|
+++ b/unoxml/source/dom/documentbuilder.cxx
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <libxml/xmlerror.h>
|
||||||
|
+#include <libxml/parser.h>
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
|
diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx
|
||||||
|
index ccc8a0872499..98909dfe8f12 100644
|
||||||
|
--- a/unoxml/source/dom/entity.cxx
|
||||||
|
+++ b/unoxml/source/dom/entity.cxx
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
#include <osl/diagnose.h>
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
+#include <libxml/entities.h>
|
||||||
|
|
||||||
|
using namespace css::uno;
|
||||||
|
using namespace css::xml::dom;
|
||||||
|
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
|
||||||
|
index a60083983882..c2b753783176 100644
|
||||||
|
--- a/unoxml/source/xpath/xpathapi.cxx
|
||||||
|
+++ b/unoxml/source/xpath/xpathapi.cxx
|
||||||
|
@@ -26,6 +26,7 @@
|
||||||
|
#include <libxml/xmlerror.h>
|
||||||
|
#include <libxml/xpath.h>
|
||||||
|
#include <libxml/xpathInternals.h>
|
||||||
|
+#include <libxml/xmlIO.h>
|
||||||
|
|
||||||
|
#include <com/sun/star/xml/xpath/XPathException.hpp>
|
||||||
|
|
||||||
|
@@ -217,7 +218,7 @@ namespace XPath
|
||||||
|
return selectSingleNode(contextNode, expr);
|
||||||
|
}
|
||||||
|
|
||||||
|
- static OUString make_error_message(xmlErrorPtr pError)
|
||||||
|
+ static OUString make_error_message(const xmlError* pError)
|
||||||
|
{
|
||||||
|
OUStringBuffer buf;
|
||||||
|
if (pError) {
|
||||||
|
@@ -259,7 +260,11 @@ namespace XPath
|
||||||
|
SAL_WARN("unoxml", "libxml2 error: " << str);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if LIBXML_VERSION >= 21200
|
||||||
|
+ static void structured_error_func(void *, const xmlError* error)
|
||||||
|
+#else
|
||||||
|
static void structured_error_func(void *, xmlErrorPtr error)
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error));
|
||||||
|
}
|
||||||
|
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
|
||||||
|
index 6879f37db295..e11dc0d16111 100644
|
||||||
|
--- a/xmloff/source/core/xmltoken.cxx
|
||||||
|
+++ b/xmloff/source/core/xmltoken.cxx
|
||||||
|
@@ -756,7 +756,7 @@ namespace xmloff::token {
|
||||||
|
TOKEN( "embedded-visible-area", XML_EMBEDDED_VISIBLE_AREA ),
|
||||||
|
TOKEN( "embossed", XML_EMBOSSED ),
|
||||||
|
TOKEN( "emissive-color", XML_EMISSIVE_COLOR ),
|
||||||
|
- TOKEN( "empty", XML_EMPTY ),
|
||||||
|
+ TOKEN( "empty", XML_TOKEN_EMPTY ),
|
||||||
|
TOKEN( "empty-line-refresh", XML_EMPTY_LINE_REFRESH ),
|
||||||
|
TOKEN( "enable-numbering", XML_ENABLE_NUMBERING ),
|
||||||
|
TOKEN( "enabled", XML_ENABLED ),
|
||||||
|
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
|
||||||
|
index 7b2cab4751aa..6f631289672b 100644
|
||||||
|
--- a/xmloff/source/style/PageMasterStyleMap.cxx
|
||||||
|
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
|
||||||
|
@@ -157,7 +157,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
|
||||||
|
PLMAP( PROP_FootnoteLineRelativeWidth, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_WIDTH ),
|
||||||
|
PLMAP( PROP_FootnoteLineTextDistance, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_DISTANCE ),
|
||||||
|
PLMAP( PROP_FootnoteLineWeight, XML_NAMESPACE_STYLE, XML_FOOTNOTE_SEP, XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_WEIGHT ),
|
||||||
|
- PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ),
|
||||||
|
+ PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_TOKEN_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ),
|
||||||
|
PLMAP_EXT(PROP_GutterMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_GUTTER, XML_TYPE_MEASURE, CTF_PM_MARGINGUTTER),
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////
|
||||||
|
diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx
|
||||||
|
index a49ccef1894c..a5863ffd0e2a 100644
|
||||||
|
--- a/xmlsecurity/inc/xmlsec/saxhelper.hxx
|
||||||
|
+++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx
|
||||||
|
@@ -23,6 +23,7 @@
|
||||||
|
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
|
+#include <libxml/parser.h>
|
||||||
|
#include <libxml/tree.h>
|
||||||
|
|
||||||
|
#include <rtl/ustring.hxx>
|
||||||
|
--
|
||||||
|
cgit v1.2.1
|
||||||
|
|
||||||
|
--- libreoffice-7.6.4.1/xmlsecurity/inc/xmlsec-wrapper.h.orig 2024-01-15 13:59:47.385791927 +0100
|
||||||
|
+++ libreoffice-7.6.4.1/xmlsecurity/inc/xmlsec-wrapper.h 2024-01-15 14:01:02.897873182 +0100
|
||||||
|
@@ -28,6 +28,7 @@
|
||||||
|
#define XMLSEC_NO_SIZE_T
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#include <libxml/parser.h>
|
||||||
|
#include <xmlsec/base64.h>
|
||||||
|
#include <xmlsec/bn.h>
|
||||||
|
#include <xmlsec/errors.h>
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- a/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:38.000000000 +0000
|
|
||||||
+++ b/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:42.000000000 +0000
|
|
||||||
@@ -403,7 +403,6 @@
|
|
||||||
{
|
|
||||||
$installdir = installer::systemactions::create_directories("install", $languageref);
|
|
||||||
installer::logger::print_message( "... creating installation set in $installdir ...\n" );
|
|
||||||
- remove_old_installation_sets($installdir);
|
|
||||||
my $inprogressinstalldir = $installdir . "_inprogress";
|
|
||||||
installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
|
|
||||||
$installdir = $inprogressinstalldir;
|
|
||||||
@ -19,7 +19,7 @@
|
|||||||
%define langpacks 1
|
%define langpacks 1
|
||||||
|
|
||||||
Name: libreoffice
|
Name: libreoffice
|
||||||
Version: 7.6.2.1
|
Version: 7.6.4.1
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: Free Office Suite
|
Summary: Free Office Suite
|
||||||
Group: Graphical Desktop/Applications/Office
|
Group: Graphical Desktop/Applications/Office
|
||||||
@ -50,21 +50,9 @@ Source34: https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubat
|
|||||||
Source35: https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
Source35: https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
||||||
Source36: https://dev-www.libreoffice.org/src/dtoa-20180411.tgz
|
Source36: https://dev-www.libreoffice.org/src/dtoa-20180411.tgz
|
||||||
Source37: https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz
|
Source37: https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz
|
||||||
Source38: https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz
|
Source38: https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz
|
||||||
Patch12: libreoffice-installfix.patch
|
Patch0: libreoffice-7.6.4.1-icu-74.2.patch
|
||||||
Patch39: libreoffice-5.1.1.1-gcc-5.3-std-isnan.patch
|
Patch1: libreoffice-7.6.4.1-libxml-2.12.patch
|
||||||
Patch40: libreoffice-5.1.3.2-x86-cppunit.patch
|
|
||||||
Patch41: libreoffice-6.0.5.1-libicu-61.1.patch
|
|
||||||
Patch42: libreoffice-6.0.5.1-upstream-glm.patch
|
|
||||||
Patch43: libreoffice-6.1.2.1-boost-1.69.patch
|
|
||||||
Patch44: libreoffice-6.4.0.3-libpoppler-0.84.0.patch
|
|
||||||
Patch45: libreoffice-6.4.3.2-build-workaround-fix-deleteTestDirectory-failed-assert.patch
|
|
||||||
Patch46: libreoffice-6.4.3.2-libpoppler-0.87.patch
|
|
||||||
Patch47: libreoffice-7.2.0.4-libfreetype-2.11.0.patch
|
|
||||||
Patch48: libreoffice-7.3.3.2-poppler-22.03.0.patch
|
|
||||||
Patch49: libreoffice-7.3.3.2-poppler-22.04.0.patch
|
|
||||||
Patch50: libreoffice-7.4.1.1-gpgme-1.18.patch
|
|
||||||
Patch51: libreoffice-7.5.0.1-zxing-2.0.0.patch
|
|
||||||
License: BSD, Common Development and Distribution License 1.0, GPL, LGPL, MPL 1.1, Netscape, Public Domain
|
License: BSD, Common Development and Distribution License 1.0, GPL, LGPL, MPL 1.1, Netscape, Public Domain
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
#liblapack.so.3()(64bit): .so link not found
|
#liblapack.so.3()(64bit): .so link not found
|
||||||
@ -529,18 +517,8 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro
|
|||||||
#% setup -q -c -T -D
|
#% setup -q -c -T -D
|
||||||
#:<< ____EOF
|
#:<< ____EOF
|
||||||
|
|
||||||
#rm -rf libreoffice-*/git-hooks
|
%patch 0 -p1 -b .icu-74.2
|
||||||
#for a in libreoffice-*/*; do mv $PWD/$a .; done
|
%patch 1 -p1 -b .libxml-2.12
|
||||||
##remove "debugging" translations
|
|
||||||
#rm -rf l10n/source/kid
|
|
||||||
|
|
||||||
#mv translations src
|
|
||||||
|
|
||||||
#%patch47 -p1
|
|
||||||
#%patch48 -p1 -b .poppler-22.03.0
|
|
||||||
#%patch49 -p0 -b .poppler-22.04.0
|
|
||||||
#%patch50 -p1
|
|
||||||
#%patch51 -p1 -b .zxing-2.0.0
|
|
||||||
|
|
||||||
touch scripting/source/pyprov/delzip
|
touch scripting/source/pyprov/delzip
|
||||||
#touch scripting/util/provider/beanshell/delzip
|
#touch scripting/util/provider/beanshell/delzip
|
||||||
@ -575,14 +553,6 @@ if [ -e writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip ]; then \
|
|||||||
writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip
|
writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## FIXME: WORKAROUND: disable failing tests
|
|
||||||
#sed -i -e "\
|
|
||||||
#/CppunitTest_emfio_emf_test/d;\
|
|
||||||
# ...
|
|
||||||
#" emfio/Module_emfio.mk sd/Module_sd.mk sc/Module_sc.mk sw/Module_sw.mk \
|
|
||||||
# xmlsecurity/Module_xmlsecurity.mk chart2/Module_chart2.mk \
|
|
||||||
# tools/Module_tools.mk sccomp/Module_sccomp.mk svx/Module_svx.mk
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#:<< _EOF
|
#:<< _EOF
|
||||||
export JAVA_HOME=%{java_home}
|
export JAVA_HOME=%{java_home}
|
||||||
@ -643,26 +613,6 @@ export JAVACMD=%{java_home}/bin/java
|
|||||||
--enable-split-app-modules \
|
--enable-split-app-modules \
|
||||||
--enable-split-opt-features
|
--enable-split-opt-features
|
||||||
|
|
||||||
# --with-branding=`pwd`/branding \
|
|
||||||
|
|
||||||
# --with-vendor="%{distribution}" \
|
|
||||||
# --with-build-version="Ver: %{version}-%{release}" \
|
|
||||||
# --with-branding=`pwd`/branding \
|
|
||||||
|
|
||||||
# --enable-symbols \
|
|
||||||
# --enable-graphite \
|
|
||||||
# --with-system-mozilla=libxul \
|
|
||||||
# --with-unix-wrapper=%{name} \
|
|
||||||
# --disable-mathmldtd \
|
|
||||||
# --with-vba-package-format="builtin" \
|
|
||||||
# --with-system-mysql \
|
|
||||||
# --without-afms \
|
|
||||||
# --with-intro-bitmap=%{SOURCE32} \
|
|
||||||
# --with-intro-progressbar-position=60,316 \
|
|
||||||
# --with-intro-progressbar-size=409,8 \
|
|
||||||
|
|
||||||
#___EOF
|
|
||||||
|
|
||||||
for i in $RPM_OPT_FLAGS; do
|
for i in $RPM_OPT_FLAGS; do
|
||||||
case "$i" in
|
case "$i" in
|
||||||
-O?|-pipe|-Wall|-g|-fexceptions) continue;;
|
-O?|-pipe|-Wall|-g|-fexceptions) continue;;
|
||||||
@ -674,18 +624,6 @@ export ARCH_FLAGS
|
|||||||
%make
|
%make
|
||||||
|
|
||||||
make -C cli_ure
|
make -C cli_ure
|
||||||
#make -C unoil
|
|
||||||
|
|
||||||
##generate the icons and mime type stuff
|
|
||||||
#export DESTDIR=../../../output
|
|
||||||
#export ICON_SOURCE_DIR=../icons
|
|
||||||
##export KDEMAINDIR=%{_kde4_prefix}
|
|
||||||
#export KDEMAINDIR=%{_prefix}
|
|
||||||
#export GNOMEDIR=%{_prefix}
|
|
||||||
#export GNOME_MIME_THEME=hicolor
|
|
||||||
#
|
|
||||||
#cd sysui/desktop/share
|
|
||||||
#./create_tree.sh
|
|
||||||
|
|
||||||
echo build end time is `date`, diskspace: `df -h . | tail -n 1`
|
echo build end time is `date`, diskspace: `df -h . | tail -n 1`
|
||||||
|
|
||||||
@ -695,17 +633,8 @@ echo build end time is `date`, diskspace: `df -h . | tail -n 1`
|
|||||||
# Workaround for: ERROR: Include file cliuhttp://www.lastampa.it/reversion.mk not found!
|
# Workaround for: ERROR: Include file cliuhttp://www.lastampa.it/reversion.mk not found!
|
||||||
make distro-pack-install DESTDIR=%{buildroot}
|
make distro-pack-install DESTDIR=%{buildroot}
|
||||||
|
|
||||||
#sed -i "s|\[|*|;s|\]|*|" file-lists/sdk_doc_list.txt
|
|
||||||
sed -i "s|%{_libdir}/libreoffice/help/bn-IN.*||" file-lists/lang_bn_IN_list.txt
|
sed -i "s|%{_libdir}/libreoffice/help/bn-IN.*||" file-lists/lang_bn_IN_list.txt
|
||||||
|
|
||||||
# NOTE: if the following installation error occurs:
|
|
||||||
#
|
|
||||||
#: ERROR: Missing files
|
|
||||||
#: in function: remove_Files_Without_Sourcedirectory
|
|
||||||
#: ***************************************************************
|
|
||||||
#
|
|
||||||
# remove the file from: unxlngi6.pro/bin/setup_osl.ins
|
|
||||||
|
|
||||||
export `grep "^PRODUCTVERSIONSHORT =" solenv/inc/productversion.mk | sed -e "s/ //g"`
|
export `grep "^PRODUCTVERSIONSHORT =" solenv/inc/productversion.mk | sed -e "s/ //g"`
|
||||||
export `grep "PRODUCTVERSION[ ]*=[ ]*" solenv/inc/productversion.mk | sed -e "s/ //g"`
|
export `grep "PRODUCTVERSION[ ]*=[ ]*" solenv/inc/productversion.mk | sed -e "s/ //g"`
|
||||||
|
|
||||||
@ -1056,6 +985,9 @@ This package contains %{langname} translations and resources for LibreOffice.\
|
|||||||
%langpack -l zu -n Zulu -F -H -Y
|
%langpack -l zu -n Zulu -F -H -Y
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 08 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 7.6.4.1-1mamba
|
||||||
|
- update to 7.6.4.1
|
||||||
|
|
||||||
* Sun Oct 08 2023 Automatic Build System <autodist@mambasoft.it> 7.6.2.1-1mamba
|
* Sun Oct 08 2023 Automatic Build System <autodist@mambasoft.it> 7.6.2.1-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user