pool/libreoffice
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 777623 from LibreOffice:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/777623
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=196
This commit is contained in:
Dominique Leuenberger
2020-02-22 18:00:26 +00:00
committed by Git OBS Bridge
parent f612ada635 8c8e87538a
commit abcb905967
16 changed files with 493 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

416
fix_old_boost_spirit_namespace.patch Normal file
View File

@@ -0,0 +1,416 @@
commit 74ac4cd9c0cbc8bc5a9b3c049731dd28c4b0d981 (HEAD -> master)
Author: Adam Majer <amajer@suse.com>
Date: Wed Feb 19 15:29:06 2020 +0100
Move Boost.Spirit usage away from legacy namespace
Remove BOOST_SPIRIT_USE_OLD_NAMESPACE defines and move all usage
of Boost.Spirit to boost::spirit::classic namespace.
Change-Id: I7dc5bed4d1b51f4a0bd1a4ae40c2024222127ce3
PR: https://gerrit.libreoffice.org/c/core/+/89079
Index: libreoffice-6.4.1.1/connectivity/Library_dbtools.mk
===================================================================
--- libreoffice-6.4.1.1.orig/connectivity/Library_dbtools.mk
+++ libreoffice-6.4.1.1/connectivity/Library_dbtools.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,dbtools
$(eval $(call gb_Library_add_defs,dbtools,\
-DOOO_DLLIMPLEMENTATION_DBTOOLS \
- -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
$(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools))
Index: libreoffice-6.4.1.1/sdext/Library_pdfimport.mk
===================================================================
--- libreoffice-6.4.1.1.orig/sdext/Library_pdfimport.mk
+++ libreoffice-6.4.1.1/sdext/Library_pdfimport.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_defs,pdfimp
endif
$(eval $(call gb_Library_add_defs,pdfimport, \
- -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
-DBOOST_ALL_NO_LIB \
))
Index: libreoffice-6.4.1.1/slideshow/Library_slideshow.mk
===================================================================
--- libreoffice-6.4.1.1.orig/slideshow/Library_slideshow.mk
+++ libreoffice-6.4.1.1/slideshow/Library_slideshow.mk
@@ -14,10 +14,6 @@ $(eval $(call gb_Library_set_include,sli
-I$(SRCDIR)/slideshow/source/inc \
))
-$(eval $(call gb_Library_add_defs,slideshow,\
- -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
-))
-
ifneq ($(strip $(debug)$(DEBUG)),)
$(eval $(call gb_Library_add_defs,slideshow,\
-DBOOST_SP_ENABLE_DEBUG_HOOKS \
Index: libreoffice-6.4.1.1/svx/Library_svx.mk
===================================================================
--- libreoffice-6.4.1.1.orig/svx/Library_svx.mk
+++ libreoffice-6.4.1.1/svx/Library_svx.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_custom_head
$(eval $(call gb_Library_add_defs,svx,\
-DSVX_DLLIMPLEMENTATION \
- -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
$(eval $(call gb_Library_set_precompiled_header,svx,svx/inc/pch/precompiled_svx))
Index: libreoffice-6.4.1.1/svx/Library_svxcore.mk
===================================================================
--- libreoffice-6.4.1.1.orig/svx/Library_svxcore.mk
+++ libreoffice-6.4.1.1/svx/Library_svxcore.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_set_precompiled
$(eval $(call gb_Library_add_defs,svxcore,\
-DSVX_DLLIMPLEMENTATION \
- -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
$(eval $(call gb_Library_use_libraries,svxcore,\
Index: libreoffice-6.4.1.1/svx/Module_svx.mk
===================================================================
--- libreoffice-6.4.1.1.orig/svx/Module_svx.mk
+++ libreoffice-6.4.1.1/svx/Module_svx.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Module_add_subsequentch
endif
#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
-#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?
#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
#todo: component file
# vim: set noet sw=4 ts=4:
Index: libreoffice-6.4.1.1/sdext/source/pdfimport/pdfparse/pdfparse.cxx
===================================================================
--- libreoffice-6.4.1.1.orig/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ libreoffice-6.4.1.1/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -49,7 +49,7 @@
#endif
-using namespace boost::spirit;
+using namespace boost::spirit::classic;
using namespace pdfparse;
@@ -556,12 +556,12 @@ std::unique_ptr<PDFEntry> PDFReader::rea
try
{
#if OSL_DEBUG_LEVEL > 0
- boost::spirit::parse_info<const char*> aInfo =
+ boost::spirit::classic::parse_info<const char*> aInfo =
#endif
- boost::spirit::parse( pBuffer,
+ boost::spirit::classic::parse( pBuffer,
pBuffer+nLen,
aGrammar,
- boost::spirit::space_p );
+ boost::spirit::classic::space_p );
#if OSL_DEBUG_LEVEL > 0
SAL_INFO("sdext.pdfimport.pdfparse", "parseinfo: stop = " << aInfo.stop << " (buff=" << pBuffer << ", offset = " << aInfo.stop - pBuffer << "), hit = " << (aInfo.hit ? OUString("true") : OUString("false")) << ", full = " << (aInfo.full ? OUString("true") : OUString("false")) << ", length = " << static_cast<int>(aInfo.length) );
#endif
@@ -634,12 +634,12 @@ std::unique_ptr<PDFEntry> PDFReader::rea
try
{
#if OSL_DEBUG_LEVEL > 0
- boost::spirit::parse_info< file_iterator<> > aInfo =
+ boost::spirit::classic::parse_info< file_iterator<> > aInfo =
#endif
- boost::spirit::parse( file_start,
+ boost::spirit::classic::parse( file_start,
file_end,
aGrammar,
- boost::spirit::space_p );
+ boost::spirit::classic::space_p );
#if OSL_DEBUG_LEVEL > 0
SAL_INFO("sdext.pdfimport.pdfparse", "parseinfo: stop at offset = " << aInfo.stop - file_start << ", hit = " << (aInfo.hit ? "true" : "false") << ", full = " << (aInfo.full ? "true" : "false") << ", length = " << aInfo.length);
#endif
Index: libreoffice-6.4.1.1/connectivity/source/commontools/RowFunctionParser.cxx
===================================================================
--- libreoffice-6.4.1.1.orig/connectivity/source/commontools/RowFunctionParser.cxx
+++ libreoffice-6.4.1.1/connectivity/source/commontools/RowFunctionParser.cxx
@@ -284,7 +284,7 @@ public:
( '-' multiplicative_expression )* )
*/
-class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar >
+class ExpressionGrammar : public ::boost::spirit::classic::grammar< ExpressionGrammar >
{
public:
/** Create an arithmetic expression grammar
@@ -303,14 +303,14 @@ public:
// grammar definition
explicit definition( const ExpressionGrammar& self )
{
- using ::boost::spirit::space_p;
- using ::boost::spirit::range_p;
- using ::boost::spirit::lexeme_d;
- using ::boost::spirit::ch_p;
- using ::boost::spirit::int_p;
- using ::boost::spirit::as_lower_d;
- using ::boost::spirit::strlit;
- using ::boost::spirit::inhibit_case;
+ using ::boost::spirit::classic::space_p;
+ using ::boost::spirit::classic::range_p;
+ using ::boost::spirit::classic::lexeme_d;
+ using ::boost::spirit::classic::ch_p;
+ using ::boost::spirit::classic::int_p;
+ using ::boost::spirit::classic::as_lower_d;
+ using ::boost::spirit::classic::strlit;
+ using ::boost::spirit::classic::inhibit_case;
typedef inhibit_case<strlit<> > token_t;
@@ -362,7 +362,7 @@ public:
BOOST_SPIRIT_DEBUG_RULE(andExpression);
}
- const ::boost::spirit::rule< ScannerT >& start() const
+ const ::boost::spirit::classic::rule< ScannerT >& start() const
{
return basicExpression;
}
@@ -370,11 +370,11 @@ public:
private:
// the constituents of the Spirit arithmetic expression grammar.
// For the sake of readability, without 'ma' prefix.
- ::boost::spirit::rule< ScannerT > basicExpression;
- ::boost::spirit::rule< ScannerT > unaryFunction;
- ::boost::spirit::rule< ScannerT > assignment;
- ::boost::spirit::rule< ScannerT > integer,argument;
- ::boost::spirit::rule< ScannerT > orExpression,andExpression;
+ ::boost::spirit::classic::rule< ScannerT > basicExpression;
+ ::boost::spirit::classic::rule< ScannerT > unaryFunction;
+ ::boost::spirit::classic::rule< ScannerT > assignment;
+ ::boost::spirit::classic::rule< ScannerT > integer,argument;
+ ::boost::spirit::classic::rule< ScannerT > orExpression,andExpression;
};
const ParserContextSharedPtr& getContext() const
@@ -417,11 +417,11 @@ std::shared_ptr<ExpressionNode> const &
ExpressionGrammar aExpressionGrammer( pContext );
- const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
- ::boost::spirit::parse( aStart,
+ const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo(
+ ::boost::spirit::classic::parse( aStart,
aEnd,
aExpressionGrammer,
- ::boost::spirit::space_p ) );
+ ::boost::spirit::classic::space_p ) );
#if (OSL_DEBUG_LEVEL > 0)
std::cout.flush(); // needed to keep stdout and cout in sync
Index: libreoffice-6.4.1.1/slideshow/source/engine/smilfunctionparser.cxx
===================================================================
--- libreoffice-6.4.1.1.orig/slideshow/source/engine/smilfunctionparser.cxx
+++ libreoffice-6.4.1.1/slideshow/source/engine/smilfunctionparser.cxx
@@ -363,14 +363,14 @@ namespace slideshow
// notation, not the 1.0e10 one.
// TODO(F1): Also handle the 1.0e10 case here.
- template< typename T > struct custom_real_parser_policies : public ::boost::spirit::ureal_parser_policies<T>
+ template< typename T > struct custom_real_parser_policies : public ::boost::spirit::classic::ureal_parser_policies<T>
{
template< typename ScannerT >
- static typename ::boost::spirit::parser_result< ::boost::spirit::chlit<>, ScannerT >::type
+ static typename ::boost::spirit::classic::parser_result< ::boost::spirit::classic::chlit<>, ScannerT >::type
parse_exp(ScannerT& scan)
{
// as_lower_d somehow breaks MSVC7
- return ::boost::spirit::ch_p('E').parse(scan);
+ return ::boost::spirit::classic::ch_p('E').parse(scan);
}
};
@@ -401,7 +401,7 @@ namespace slideshow
( '-' multiplicative_expression )* )
*/
- class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar >
+ class ExpressionGrammar : public ::boost::spirit::classic::grammar< ExpressionGrammar >
{
public:
/** Create an arithmetic expression grammar
@@ -420,8 +420,8 @@ namespace slideshow
// grammar definition
explicit definition( const ExpressionGrammar& self )
{
- using ::boost::spirit::str_p;
- using ::boost::spirit::real_parser;
+ using ::boost::spirit::classic::str_p;
+ using ::boost::spirit::classic::real_parser;
identifier =
str_p( "$" )[ ValueTFunctor( self.getContext()) ]
@@ -487,7 +487,7 @@ namespace slideshow
BOOST_SPIRIT_DEBUG_RULE(identifier);
}
- const ::boost::spirit::rule< ScannerT >& start() const
+ const ::boost::spirit::classic::rule< ScannerT >& start() const
{
return additiveExpression;
}
@@ -495,13 +495,13 @@ namespace slideshow
private:
// the constituents of the Spirit arithmetic expression grammar.
// For the sake of readability, without 'ma' prefix.
- ::boost::spirit::rule< ScannerT > additiveExpression;
- ::boost::spirit::rule< ScannerT > multiplicativeExpression;
- ::boost::spirit::rule< ScannerT > unaryExpression;
- ::boost::spirit::rule< ScannerT > basicExpression;
- ::boost::spirit::rule< ScannerT > unaryFunction;
- ::boost::spirit::rule< ScannerT > binaryFunction;
- ::boost::spirit::rule< ScannerT > identifier;
+ ::boost::spirit::classic::rule< ScannerT > additiveExpression;
+ ::boost::spirit::classic::rule< ScannerT > multiplicativeExpression;
+ ::boost::spirit::classic::rule< ScannerT > unaryExpression;
+ ::boost::spirit::classic::rule< ScannerT > basicExpression;
+ ::boost::spirit::classic::rule< ScannerT > unaryFunction;
+ ::boost::spirit::classic::rule< ScannerT > binaryFunction;
+ ::boost::spirit::classic::rule< ScannerT > identifier;
};
const ParserContextSharedPtr& getContext() const
@@ -547,11 +547,11 @@ namespace slideshow
ExpressionGrammar aExpressionGrammer( pContext );
- const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
- ::boost::spirit::parse( aStart,
+ const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo(
+ ::boost::spirit::classic::parse( aStart,
aEnd,
aExpressionGrammer,
- ::boost::spirit::space_p ) );
+ ::boost::spirit::classic::space_p ) );
#if OSL_DEBUG_LEVEL > 0
::std::cout.flush(); // needed to keep stdout and cout in sync
@@ -590,11 +590,11 @@ namespace slideshow
ExpressionGrammar aExpressionGrammer( pContext );
- const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
- ::boost::spirit::parse( aStart,
+ const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo(
+ ::boost::spirit::classic::parse( aStart,
aEnd,
- aExpressionGrammer >> ::boost::spirit::end_p,
- ::boost::spirit::space_p ) );
+ aExpressionGrammer >> ::boost::spirit::classic::end_p,
+ ::boost::spirit::classic::space_p ) );
#if OSL_DEBUG_LEVEL > 0
::std::cout.flush(); // needed to keep stdout and cout in sync
Index: libreoffice-6.4.1.1/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
===================================================================
--- libreoffice-6.4.1.1.orig/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ libreoffice-6.4.1.1/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -922,14 +922,14 @@ public:
// notation, not the 1.0e10 one.
// TODO(F1): Also handle the 1.0e10 case here.
-template< typename T > struct custom_real_parser_policies : public ::boost::spirit::ureal_parser_policies<T>
+template< typename T > struct custom_real_parser_policies : public ::boost::spirit::classic::ureal_parser_policies<T>
{
template< typename ScannerT >
- static typename ::boost::spirit::parser_result< ::boost::spirit::chlit<>, ScannerT >::type
+ static typename ::boost::spirit::classic::parser_result< ::boost::spirit::classic::chlit<>, ScannerT >::type
parse_exp(ScannerT& scan)
{
// as_lower_d somehow breaks MSVC7
- return ::boost::spirit::ch_p('E').parse(scan);
+ return ::boost::spirit::classic::ch_p('E').parse(scan);
}
};
@@ -961,7 +961,7 @@ template< typename T > struct custom_rea
*/
-class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar >
+class ExpressionGrammar : public ::boost::spirit::classic::grammar< ExpressionGrammar >
{
public:
/** Create an arithmetic expression grammar
@@ -980,10 +980,10 @@ public:
// grammar definition
explicit definition( const ExpressionGrammar& self )
{
- using ::boost::spirit::str_p;
- using ::boost::spirit::range_p;
- using ::boost::spirit::lexeme_d;
- using ::boost::spirit::real_parser;
+ using ::boost::spirit::classic::str_p;
+ using ::boost::spirit::classic::range_p;
+ using ::boost::spirit::classic::lexeme_d;
+ using ::boost::spirit::classic::real_parser;
identifier =
str_p( "pi" )[ EnumFunctor(ExpressionFunct::EnumPi, self.getContext() ) ]
@@ -1072,7 +1072,7 @@ public:
BOOST_SPIRIT_DEBUG_RULE(identifier);
}
- const ::boost::spirit::rule< ScannerT >& start() const
+ const ::boost::spirit::classic::rule< ScannerT >& start() const
{
return additiveExpression;
}
@@ -1080,18 +1080,18 @@ public:
private:
// the constituents of the Spirit arithmetic expression grammar.
// For the sake of readability, without 'ma' prefix.
- ::boost::spirit::rule< ScannerT > additiveExpression;
- ::boost::spirit::rule< ScannerT > multiplicativeExpression;
- ::boost::spirit::rule< ScannerT > unaryExpression;
- ::boost::spirit::rule< ScannerT > basicExpression;
- ::boost::spirit::rule< ScannerT > unaryFunction;
- ::boost::spirit::rule< ScannerT > binaryFunction;
- ::boost::spirit::rule< ScannerT > ternaryFunction;
- ::boost::spirit::rule< ScannerT > funcRef_decl;
- ::boost::spirit::rule< ScannerT > functionReference;
- ::boost::spirit::rule< ScannerT > modRef_decl;
- ::boost::spirit::rule< ScannerT > modifierReference;
- ::boost::spirit::rule< ScannerT > identifier;
+ ::boost::spirit::classic::rule< ScannerT > additiveExpression;
+ ::boost::spirit::classic::rule< ScannerT > multiplicativeExpression;
+ ::boost::spirit::classic::rule< ScannerT > unaryExpression;
+ ::boost::spirit::classic::rule< ScannerT > basicExpression;
+ ::boost::spirit::classic::rule< ScannerT > unaryFunction;
+ ::boost::spirit::classic::rule< ScannerT > binaryFunction;
+ ::boost::spirit::classic::rule< ScannerT > ternaryFunction;
+ ::boost::spirit::classic::rule< ScannerT > funcRef_decl;
+ ::boost::spirit::classic::rule< ScannerT > functionReference;
+ ::boost::spirit::classic::rule< ScannerT > modRef_decl;
+ ::boost::spirit::classic::rule< ScannerT > modifierReference;
+ ::boost::spirit::classic::rule< ScannerT > identifier;
};
const ParserContextSharedPtr& getContext() const
@@ -1137,11 +1137,11 @@ std::shared_ptr<ExpressionNode> const &
pContext->mpCustoShape = &rCustoShape;
ExpressionGrammar aExpressionGrammer( pContext );
- const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
- ::boost::spirit::parse( aStart,
+ const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo(
+ ::boost::spirit::classic::parse( aStart,
aEnd,
- aExpressionGrammer >> ::boost::spirit::end_p,
- ::boost::spirit::space_p ) );
+ aExpressionGrammer >> ::boost::spirit::classic::end_p,
+ ::boost::spirit::classic::space_p ) );
// input fully congested by the parser?
if( !aParseInfo.full )

3
libreoffice-6.4.0.3.tar.xz
View File

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

16
libreoffice-6.4.0.3.tar.xz.asc
View File

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

3
libreoffice-6.4.1.1.tar.xz Normal file
View File

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

16
libreoffice-6.4.1.1.tar.xz.asc Normal file
View File

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

3
libreoffice-help-6.4.0.3.tar.xz
View File

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

16
libreoffice-help-6.4.0.3.tar.xz.asc
View File

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

3
libreoffice-help-6.4.1.1.tar.xz Normal file
View File

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

16
libreoffice-help-6.4.1.1.tar.xz.asc Normal file
View File

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

3
libreoffice-translations-6.4.0.3.tar.xz
View File

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

16
libreoffice-translations-6.4.0.3.tar.xz.asc
View File

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

3
libreoffice-translations-6.4.1.1.tar.xz Normal file
View File

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

16
libreoffice-translations-6.4.1.1.tar.xz.asc Normal file
View File

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

15
libreoffice.changes
View File

@@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Feb 19 11:46:11 UTC 2020 - Adam Majer <adam.majer@suse.de>
- fix_old_boost_spirit_namespace.patch: fixes build with older
boost versions by moving to modern Boost.Spirit namespace usage
-------------------------------------------------------------------
Mon Feb 17 08:03:45 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 6.4.1.1:
* 6.4.1 RC1 release
* Add sfir and breeze dark svg iconsets
- Remove merged patch:
* lo-Fix-build-with-poppler-0.83.patch
-------------------------------------------------------------------
Wed Feb 12 11:03:39 UTC 2020 - Marina Latini <marina.latini@suse.com>

9
libreoffice.spec
View File

@@ -50,7 +50,7 @@
%bcond_with system_gpgme
%endif
Name: libreoffice
Version: 6.4.0.3
Version: 6.4.1.1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@@ -98,10 +98,9 @@ Patch1: scp2-user-config-suse.diff
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
# PATCH-FIX-UPSTREAM lo-Fix-build-with-poppler-0.83.patch
Patch4: lo-Fix-build-with-poppler-0.83.patch
# PATCH-FIX-UPSTREAM soffice.sh_Avoid-exporting-empty-LC_ALL.patch
Patch5: soffice.sh_Avoid-exporting-empty-LC_ALL.patch
Patch6: fix_old_boost_spirit_namespace.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep
@@ -957,8 +956,8 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%endif # Leap 42/SLE-12
%patch2
%patch3
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch990 -p1
%patch991 -p1
@@ -1538,12 +1537,14 @@ exit 0
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_breeze.zip
%{_datadir}/%{name}/share/config/images_breeze_dark.zip
%{_datadir}/%{name}/share/config/images_breeze_dark_svg.zip
%{_datadir}/%{name}/share/config/images_elementary.zip
%{_datadir}/%{name}/share/config/images_colibre.zip
%{_datadir}/%{name}/share/config/images_karasa_jaga.zip
%{_datadir}/%{name}/share/config/images_karasa_jaga_svg.zip
%{_datadir}/%{name}/share/config/images_sifr.zip
%{_datadir}/%{name}/share/config/images_sifr_dark.zip
%{_datadir}/%{name}/share/config/images_sifr_dark_svg.zip
%{_datadir}/%{name}/share/config/images_sifr_svg.zip
%{_datadir}/%{name}/share/config/images_tango.zip
%{_datadir}/%{name}/share/config/images_helpimg.zip

71
lo-Fix-build-with-poppler-0.83.patch
View File

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