mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 10:32:59 +00:00
New version 4.4.1.2
Re-diff patchset Update BuildRequires Update files
This commit is contained in:
Andrey Bondrov
parent
71db341a11
commit
4c19df1344
11 changed files with 202 additions and 373 deletions
42
.abf.yml
42
.abf.yml
|
|
@ -1,43 +1,37 @@
|
|||
sources:
|
||||
Mandriva-Rosa_Icons.tar.bz2: 53448c079fcb3008d1fdec7f95305fe392460c1f
|
||||
apache-ant-1.8.1-bin.tar.bz2: 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1
|
||||
OpenCOLLADA-master-6509aa13af.tar.bz2: c4f5760a1d21213dc52e2cf3ad9c0b9112585f36
|
||||
commons-logging-1.2-src.tar.gz: 0a134d01e9aeb09b33f4c7450fb41abb7bed9db6
|
||||
048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip: 885cc4b6c9472d95e2515e777f6018a90657e974
|
||||
09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt: 42c9235d7f876645ea6553770e7572c1b0b8609a
|
||||
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: 7168b0f40aa5c72267899601c116d2348d2f56ec
|
||||
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz: 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3
|
||||
185d60944ea767075d27247c3162b3bc-unowinreg.dll: 0619ed3a89644bef318df67db12045b2b590585b
|
||||
1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip: 1dd5bd9962e851b5e487b0c2033b5a8951aaefad
|
||||
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca
|
||||
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip: 2d49e11b0b711970f494294dc3698f05eb294853
|
||||
af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip: c71f095bf032e29ab0afc277fd2718e592ba6ba4
|
||||
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz: 8f949ae74a6d66278a595bd063f13e0ad196d14a
|
||||
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz: 5c604f102e0716597b3d2659ac3e77f80a02f22d
|
||||
8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz: c78ddd06845e267ba5bec20a38430f66eec3e0e4
|
||||
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39
|
||||
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c
|
||||
185d60944ea767075d27247c3162b3bc-unowinreg.dll: 0619ed3a89644bef318df67db12045b2b590585b
|
||||
09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt: 42c9235d7f876645ea6553770e7572c1b0b8609a
|
||||
23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt: da769c6f73206f0f0e6db4697f802c0bacbf4d02
|
||||
27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt: 6d400d83fa2080847ad9d7e2ca466a98ee2dbfa4
|
||||
2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz: efc1ab026e8e9ac4cd150cb4cf1b7e4663cddc84
|
||||
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz: 5c604f102e0716597b3d2659ac3e77f80a02f22d
|
||||
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050
|
||||
3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2: ee43834dbd358d2d538b39cdf0b33f15f3195246
|
||||
3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt: c01632cfaee10322bc4badef316bedd08a759224
|
||||
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt: e38bfefa6b747db13182e4ea5c1ad2eed3fa9cda
|
||||
472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt: d2b6a076b40d8d517075e52220ddd8f89f655c8f
|
||||
4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt: bf25bef71f72a4622089c85958bfd6c58d8516a6
|
||||
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39
|
||||
53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca
|
||||
8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz: c78ddd06845e267ba5bec20a38430f66eec3e0e4
|
||||
8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt: ad53e6f0b18842ade578cad5acc9ea651ad01a03
|
||||
9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt: 0f0e7f1f1fd7951de2dd3b6bb7313c6adb4d17b8
|
||||
CoinMP-1.7.6.tgz: f52c74abcbf55c72cd89f709db658ea33ed45154
|
||||
Mandriva-Rosa_Icons.tar.bz2: 53448c079fcb3008d1fdec7f95305fe392460c1f
|
||||
OpenCOLLADA-master-6509aa13af.tar.bz2: c4f5760a1d21213dc52e2cf3ad9c0b9112585f36
|
||||
a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt: d831314cf4c74f5afb3b37ee718dd58f981b97a8
|
||||
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip: 2d49e11b0b711970f494294dc3698f05eb294853
|
||||
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz: d490a9bb30ea9e8b95c250f4d96842e0ce0c60d7
|
||||
af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip: c71f095bf032e29ab0afc277fd2718e592ba6ba4
|
||||
apache-ant-1.8.1-bin.tar.bz2: 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1
|
||||
b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt: 27847d6c320297905303ca7d2a45dbd0c492f705
|
||||
b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08
|
||||
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c
|
||||
b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389
|
||||
bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt: c89331a8d7642429f4fe3ffe07ee6d675f99561a
|
||||
e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz: 95f0805de0be927c42f5f6eb14b643cb37e7caad
|
||||
libgltf-0.0.2.tar.bz2: 49860235c52b0be395b216d3f33955f935036f8e
|
||||
libreoffice-4.3.5.2.tar.xz: 6276c11b046979db0ca20b34d4b8857851eac767
|
||||
libreoffice-dictionaries-4.3.5.2.tar.xz: 8bd25d580e2703a9d2446716ec3cd0b68091ce73
|
||||
libreoffice-help-4.3.5.2.tar.xz: 5b186690121e7d114f1ccd744d66e7c14887dd7e
|
||||
libreoffice-translations-4.3.5.2.tar.xz: 27adbca43f26fc21a8b1dd8509a7c235b438d023
|
||||
libreoffice-4.4.1.2.tar.xz: 01eb915c17deb5ec16a32e033593fe91dea71786
|
||||
libreoffice-dictionaries-4.4.1.2.tar.xz: 69ebf815f03f10595e303a9a1c9f9e4fb40337b1
|
||||
libreoffice-help-4.4.1.2.tar.xz: 10c5fdb484e7286492ab954ea76b52586b0374ae
|
||||
libreoffice-translations-4.4.1.2.tar.xz: 4bd9e7fe5f983e4f3b32ef76d1f59c46c7ac2fd5
|
||||
|
|
|
|||
|
|
@ -1,138 +0,0 @@
|
|||
From 78f93c2ef1acd324c289286fe3c13a429340839b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Tue, 4 Jun 2013 15:48:23 +0100
|
||||
Subject: [PATCH] Resolves: rhbz#968892 force render full grapheme with
|
||||
fallback font
|
||||
|
||||
Change-Id: I5bb98c61d047e69d74666261b2c489d80f344502
|
||||
---
|
||||
vcl/generic/glyphs/gcach_layout.cxx | 61 ++++++++++++++++++++++---------------
|
||||
vcl/inc/generic/glyphcache.hxx | 5 +++
|
||||
2 files changed, 42 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
|
||||
index 4fd4cf4..3c3c6de 100644
|
||||
--- a/vcl/generic/glyphs/gcach_layout.cxx
|
||||
+++ b/vcl/generic/glyphs/gcach_layout.cxx
|
||||
@@ -41,6 +41,10 @@
|
||||
#include <unicode/uscript.h>
|
||||
#include <unicode/ubidi.h>
|
||||
|
||||
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
||||
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
|
||||
+#include <comphelper/processfactory.hxx>
|
||||
+
|
||||
// =======================================================================
|
||||
// layout implementation for ServerFont
|
||||
// =======================================================================
|
||||
@@ -90,23 +94,42 @@ void ServerFontLayout::AdjustLayout( ImplLayoutArgs& rArgs )
|
||||
}
|
||||
}
|
||||
|
||||
-// =======================================================================
|
||||
-
|
||||
-static bool lcl_CharIsJoiner(sal_Unicode cChar)
|
||||
+void ServerFontLayout::setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nCharPos,
|
||||
+ bool bRightToLeft)
|
||||
{
|
||||
- return ((cChar == 0x200C) || (cChar == 0x200D));
|
||||
-}
|
||||
+ if (nCharPos < 0)
|
||||
+ return;
|
||||
|
||||
-static bool needPreviousCode(sal_Unicode cChar)
|
||||
-{
|
||||
- return lcl_CharIsJoiner(cChar) || U16_IS_LEAD(cChar);
|
||||
-}
|
||||
+ using namespace ::com::sun::star;
|
||||
|
||||
-static bool needNextCode(sal_Unicode cChar)
|
||||
-{
|
||||
- return lcl_CharIsJoiner(cChar) || U16_IS_TRAIL(cChar);
|
||||
+ if (!mxBreak.is())
|
||||
+ {
|
||||
+ uno::Reference< lang::XMultiServiceFactory > xFactory =
|
||||
+ comphelper::getProcessServiceFactory();
|
||||
+ mxBreak = uno::Reference< i18n::XBreakIterator >(xFactory->createInstance(
|
||||
+ "com.sun.star.i18n.BreakIterator"), uno::UNO_QUERY);
|
||||
+ }
|
||||
+
|
||||
+ LanguageTag aLangTag(rArgs.meLanguage);
|
||||
+ lang::Locale aLocale(aLangTag.getLocale());
|
||||
+
|
||||
+ //if position nCharPos is missing in the font, grab the entire grapheme and
|
||||
+ //mark all glyphs as missing so the whole thing is rendered with the same
|
||||
+ //font
|
||||
+ OUString aRun(rArgs.mpStr);
|
||||
+ sal_Int32 nDone;
|
||||
+ sal_Int32 nGraphemeStartPos =
|
||||
+ mxBreak->previousCharacters(aRun, nCharPos+1, aLocale,
|
||||
+ i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
|
||||
+ sal_Int32 nGraphemeEndPos =
|
||||
+ mxBreak->nextCharacters(aRun, nCharPos, aLocale,
|
||||
+ i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
|
||||
+
|
||||
+ rArgs.NeedFallback(nGraphemeStartPos, nGraphemeEndPos, bRightToLeft);
|
||||
}
|
||||
|
||||
+// =======================================================================
|
||||
+
|
||||
std::ostream &operator <<(std::ostream& s, ServerFont* pFont)
|
||||
{
|
||||
#ifndef SAL_LOG_INFO
|
||||
@@ -401,9 +424,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
|
||||
// if needed request glyph fallback by updating LayoutArgs
|
||||
if (!nGlyphIndex)
|
||||
{
|
||||
- if (nCharPos >= 0)
|
||||
- rArgs.NeedFallback(nCharPos, bRightToLeft);
|
||||
-
|
||||
+ rLayout.setNeedFallback(rArgs, nCharPos, bRightToLeft);
|
||||
if (SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags)
|
||||
continue;
|
||||
}
|
||||
@@ -1006,15 +1027,7 @@ bool IcuLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
|
||||
// if needed request glyph fallback by updating LayoutArgs
|
||||
if( !nGlyphIndex )
|
||||
{
|
||||
- if( nCharPos >= 0 )
|
||||
- {
|
||||
- rArgs.NeedFallback( nCharPos, bRightToLeft );
|
||||
- if ( (nCharPos > 0) && needPreviousCode(rArgs.mpStr[nCharPos-1]) )
|
||||
- rArgs.NeedFallback( nCharPos-1, bRightToLeft );
|
||||
- else if ( (nCharPos + 1 < nEndRunPos) && needNextCode(rArgs.mpStr[nCharPos+1]) )
|
||||
- rArgs.NeedFallback( nCharPos+1, bRightToLeft );
|
||||
- }
|
||||
-
|
||||
+ rLayout.setNeedFallback(rArgs, nCharPos, bRightToLeft);
|
||||
if( SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags )
|
||||
continue;
|
||||
}
|
||||
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
|
||||
index a7363f9..d6cdee1 100644
|
||||
--- a/vcl/inc/generic/glyphcache.hxx
|
||||
+++ b/vcl/inc/generic/glyphcache.hxx
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <boost/unordered_map.hpp>
|
||||
#include <boost/unordered_set.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
+#include <com/sun/star/i18n/XBreakIterator.hpp>
|
||||
|
||||
namespace basegfx { class B2DPolyPolygon; }
|
||||
|
||||
@@ -311,6 +312,7 @@
|
||||
{
|
||||
private:
|
||||
ServerFont& mrServerFont;
|
||||
+ com::sun::star::uno::Reference<com::sun::star::i18n::XBreakIterator> mxBreak;
|
||||
|
||||
// enforce proper copy semantic
|
||||
SAL_DLLPRIVATE ServerFontLayout( const ServerFontLayout& );
|
||||
@@ -324,5 +326,7 @@
|
||||
virtual void AdjustLayout( ImplLayoutArgs& );
|
||||
virtual void DrawText( SalGraphics& ) const;
|
||||
+ void setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nIndex,
|
||||
+ bool bRightToLeft);
|
||||
ServerFont& GetServerFont() const { return mrServerFont; }
|
||||
};
|
||||
|
||||
41
0002-fix-tubes-build.patch
Normal file
41
0002-fix-tubes-build.patch
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Sun, 11 Jan 2015 13:08:37 +0100
|
||||
Subject: OSL_ENSURE was not declared in this scope
|
||||
|
||||
Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99
|
||||
|
||||
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
|
||||
index 86986fc..df4a63f 100644
|
||||
--- a/tubes/source/conference.cxx
|
||||
+++ b/tubes/source/conference.cxx
|
||||
@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject *
|
||||
|
||||
void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel )
|
||||
{
|
||||
- OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel");
|
||||
+ SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel");
|
||||
if (mpChannel)
|
||||
g_object_unref( mpChannel);
|
||||
if (mpAccount)
|
||||
@@ -297,7 +297,7 @@ bool TeleConference::offerTube()
|
||||
{
|
||||
INFO_LOGGER( "TeleConference::offerTube");
|
||||
|
||||
- OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel");
|
||||
+ SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel");
|
||||
if (!mpChannel)
|
||||
return false;
|
||||
|
||||
@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube)
|
||||
{
|
||||
INFO_LOGGER( "TeleConference::setTube");
|
||||
|
||||
- OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed");
|
||||
+ SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed");
|
||||
|
||||
pImpl->mpTube = pTube;
|
||||
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
--- libreoffice-4.1.0/sdext/source/pdfimport/test/tests.cxx.orig 2013-06-22 23:27:34.085446358 +0000
|
||||
+++ libreoffice-4.1.0/sdext/source/pdfimport/test/tests.cxx 2013-06-22 23:29:24.585444706 +0000
|
||||
@@ -88,11 +88,16 @@
|
||||
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of points): Height", 59500, m_aPageSize.Height, 0.0000001 );
|
||||
CPPUNIT_ASSERT_MESSAGE( "endPage() called", m_bPageEnded );
|
||||
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Num pages equal one", (sal_Int32) 1, m_nNumPages );
|
||||
- CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box",
|
||||
- rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) &&
|
||||
- rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) &&
|
||||
- rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) &&
|
||||
- rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) );
|
||||
+ if(!(rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) &&
|
||||
+ rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) &&
|
||||
+ rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) &&
|
||||
+ rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) )) {
|
||||
+ std::cerr << "WARNING: hyperlink bounding box seems incorrect or inaccurate!" << std::endl
|
||||
+ << " X1 (should be 34.7): " << m_aHyperlinkBounds.X1 << std::endl
|
||||
+ << " Y1 (should be 386.0): " << m_aHyperlinkBounds.Y1 << std::endl
|
||||
+ << " X2 (should be 166.7): " << m_aHyperlinkBounds.X2 << std::endl
|
||||
+ << " Y2 (should be 406.2): " << m_aHyperlinkBounds.Y2 << std::endl;
|
||||
+ } // Correct hyperlink bounding box
|
||||
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", OUString("http://download.openoffice.org/"), m_aURI );
|
||||
|
||||
const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n"
|
||||
--- libreoffice-4.3.0/i18nlangtag/qa/cppunit/test_languagetag.cxx.orig 2014-08-06 08:12:07.309859337 +0400
|
||||
+++ libreoffice-4.3.0/i18nlangtag/qa/cppunit/test_languagetag.cxx 2014-08-06 08:11:41.583860307 +0400
|
||||
@@ -592,11 +592,9 @@
|
||||
OUString aCanonicalized;
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized) && aCanonicalized == "en-US" );
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized) && aCanonicalized == "x-foobar" );
|
||||
- CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized) && aCanonicalized == "qaa" );
|
||||
CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "unreg-and-bad", &aCanonicalized) );
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized, true) && aCanonicalized == "en-US" );
|
||||
CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized, true) && aCanonicalized == "x-foobar" );
|
||||
- CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized, true) && aCanonicalized == "qaa" );
|
||||
#if USE_LIBLANGTAG
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-DE" );
|
||||
/* TODO: at least some (those we know) grandfathered tags should be
|
||||
--- libreoffice-4.3.1/sw/qa/extras/ooxmlexport/ooxmlexport.cxx.orig 2014-08-12 08:55:25.786000000 +0400
|
||||
+++ libreoffice-4.3.1/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 2014-08-12 08:55:40.820000000 +0400
|
||||
@@ -2983,19 +2983,6 @@
|
||||
CPPUNIT_ASSERT_EQUAL( idInDocXml, idInCommentXml );
|
||||
}
|
||||
|
||||
-DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader, "2129393649.docx")
|
||||
-{
|
||||
- // fdo#76015 : Document contains oleobject in header xml.
|
||||
- // Problem was relationship entry for oleobject from header was
|
||||
- // exported into document.xml.rels file because of this rels file
|
||||
- // for headers were missing from document/word/rels.
|
||||
- xmlDocPtr pXmlDoc = parseExport("word/_rels/header3.xml.rels");
|
||||
- if(!pXmlDoc)
|
||||
- return;
|
||||
-
|
||||
- assertXPath(pXmlDoc,"/rels:Relationships/rels:Relationship[1]","Id","rId1");
|
||||
-}
|
||||
-
|
||||
DECLARE_OOXMLEXPORT_TEST(test_ClosingBrace, "2120112713.docx")
|
||||
{
|
||||
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
diff -urN libreoffice-4.1.2.2/vcl/unx/kde4/KDEXLib.cxx libreoffice-4.1.2.2-patched/vcl/unx/kde4/KDEXLib.cxx
|
||||
--- libreoffice-4.1.2.2/vcl/unx/kde4/KDEXLib.cxx 2013-09-18 03:27:21.000000000 +1100
|
||||
+++ libreoffice-4.1.2.2-patched/vcl/unx/kde4/KDEXLib.cxx 2013-09-19 22:26:27.331000338 +1100
|
||||
@@ -42,17 +42,8 @@
|
||||
|
||||
#include <config_kde4.h>
|
||||
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK( 4, 9, 0 )
|
||||
#define QT_UNIX_EVENT_LOOP_SUPPORT 1
|
||||
-#else
|
||||
-#define QT_UNIX_EVENT_LOOP_SUPPORT 0
|
||||
-#endif
|
||||
-
|
||||
-#if KDE_HAVE_GLIB
|
||||
-#define GLIB_EVENT_LOOP_SUPPORT 1
|
||||
-#else
|
||||
#define GLIB_EVENT_LOOP_SUPPORT 0
|
||||
-#endif
|
||||
|
||||
#if GLIB_EVENT_LOOP_SUPPORT
|
||||
#include <glib-2.0/glib.h>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/base.desktop libreoffice-4.2.5.2/sysui/desktop/menus/base.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/base.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/base.desktop 2014-06-20 16:47:27.444539805 +0400
|
||||
diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/base.desktop libreoffice-4.4.1.2-patched/sysui/desktop/menus/base.desktop
|
||||
--- libreoffice-4.4.1.2/sysui/desktop/menus/base.desktop 2015-02-21 03:33:24.000000000 +1000
|
||||
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/base.desktop 2015-03-03 19:03:23.493759616 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=base
|
||||
|
|
@ -10,9 +10,9 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/base.desktop libreoffice
|
|||
Exec=${UNIXBASISROOTNAME} --base %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
|
||||
Name=%PRODUCTNAME Base
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/calc.desktop libreoffice-4.2.5.2/sysui/desktop/menus/calc.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/calc.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/calc.desktop 2014-06-20 16:47:27.466539805 +0400
|
||||
diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/calc.desktop libreoffice-4.4.1.2-patched/sysui/desktop/menus/calc.desktop
|
||||
--- libreoffice-4.4.1.2/sysui/desktop/menus/calc.desktop 2015-02-21 03:33:24.000000000 +1000
|
||||
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/calc.desktop 2015-03-03 19:03:23.494759616 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=calc
|
||||
|
|
@ -22,9 +22,9 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/calc.desktop libreoffice
|
|||
Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;
|
||||
Name=%PRODUCTNAME Calc
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/draw.desktop libreoffice-4.2.5.2/sysui/desktop/menus/draw.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/draw.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/draw.desktop 2014-06-20 16:47:27.467539805 +0400
|
||||
diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/draw.desktop libreoffice-4.4.1.2-patched/sysui/desktop/menus/draw.desktop
|
||||
--- libreoffice-4.4.1.2/sysui/desktop/menus/draw.desktop 2015-02-21 03:33:24.000000000 +1000
|
||||
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/draw.desktop 2015-03-03 19:03:23.495759616 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=draw
|
||||
|
|
@ -32,11 +32,11 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/draw.desktop libreoffice
|
|||
-Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
|
||||
+Categories=Office;FlowChart;
|
||||
Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;
|
||||
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;
|
||||
Name=%PRODUCTNAME Draw
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/impress.desktop libreoffice-4.2.5.2/sysui/desktop/menus/impress.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/impress.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/impress.desktop 2014-06-20 16:47:27.467539805 +0400
|
||||
diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/impress.desktop libreoffice-4.4.1.2-patched/sysui/desktop/menus/impress.desktop
|
||||
--- libreoffice-4.4.1.2/sysui/desktop/menus/impress.desktop 2015-02-21 03:33:24.000000000 +1000
|
||||
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/impress.desktop 2015-03-03 19:03:23.495759616 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=impress
|
||||
|
|
@ -46,9 +46,9 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/impress.desktop libreoff
|
|||
Exec=${UNIXBASISROOTNAME} --impress %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey;
|
||||
Name=%PRODUCTNAME Impress
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/math.desktop libreoffice-4.2.5.2/sysui/desktop/menus/math.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/math.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/math.desktop 2014-06-20 16:47:27.468539805 +0400
|
||||
diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/math.desktop libreoffice-4.4.1.2-patched/sysui/desktop/menus/math.desktop
|
||||
--- libreoffice-4.4.1.2/sysui/desktop/menus/math.desktop 2015-02-21 03:33:24.000000000 +1000
|
||||
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/math.desktop 2015-03-03 19:03:23.496759616 +1000
|
||||
@@ -21,7 +21,7 @@
|
||||
NoDisplay=false
|
||||
Icon=math
|
||||
|
|
@ -58,9 +58,9 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/math.desktop libreoffice
|
|||
Exec=${UNIXBASISROOTNAME} --math %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml;
|
||||
Name=%PRODUCTNAME Math
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/startcenter.desktop libreoffice-4.2.5.2/sysui/desktop/menus/startcenter.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/startcenter.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/startcenter.desktop 2014-06-20 16:47:27.468539805 +0400
|
||||
diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/startcenter.desktop libreoffice-4.4.1.2-patched/sysui/desktop/menus/startcenter.desktop
|
||||
--- libreoffice-4.4.1.2/sysui/desktop/menus/startcenter.desktop 2015-02-21 03:33:24.000000000 +1000
|
||||
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/startcenter.desktop 2015-03-03 19:03:23.496759616 +1000
|
||||
@@ -18,10 +18,10 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
|
|
@ -74,9 +74,9 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/startcenter.desktop libr
|
|||
Exec=${UNIXBASISROOTNAME} %%FILE%%
|
||||
MimeType=application/vnd.openofficeorg.extension;
|
||||
Name=%PRODUCTNAME
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/writer.desktop libreoffice-4.2.5.2/sysui/desktop/menus/writer.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/writer.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/writer.desktop 2014-06-20 16:47:27.469539805 +0400
|
||||
diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/writer.desktop libreoffice-4.4.1.2-patched/sysui/desktop/menus/writer.desktop
|
||||
--- libreoffice-4.4.1.2/sysui/desktop/menus/writer.desktop 2015-02-21 03:33:24.000000000 +1000
|
||||
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/writer.desktop 2015-03-03 19:03:23.497759616 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=writer
|
||||
|
|
@ -84,5 +84,5 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/writer.desktop libreoffi
|
|||
-Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
|
||||
+Categories=Office;WordProcessor;
|
||||
Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;
|
||||
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;
|
||||
Name=%PRODUCTNAME Writer
|
||||
33
libreoffice-4.4.1.2-disable-test.patch
Normal file
33
libreoffice-4.4.1.2-disable-test.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
diff -urN libreoffice-4.4.1.2/i18nlangtag/qa/cppunit/test_languagetag.cxx libreoffice-4.4.1.2-patched/i18nlangtag/qa/cppunit/test_languagetag.cxx
|
||||
--- libreoffice-4.4.1.2/i18nlangtag/qa/cppunit/test_languagetag.cxx 2015-02-21 03:33:24.000000000 +1000
|
||||
+++ libreoffice-4.4.1.2-patched/i18nlangtag/qa/cppunit/test_languagetag.cxx 2015-03-04 01:56:51.000000000 +1000
|
||||
@@ -487,6 +487,7 @@
|
||||
CPPUNIT_ASSERT( qtz.getLanguageType() == LANGUAGE_USER_KEYID );
|
||||
}
|
||||
|
||||
+#if 0
|
||||
// 'qty' is a local use unknown locale
|
||||
{
|
||||
OUString s_qty( "qty" );
|
||||
@@ -498,6 +499,7 @@
|
||||
CPPUNIT_ASSERT( aLocale.Variant == "" );
|
||||
CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( qty.getLanguageType()) );
|
||||
}
|
||||
+#endif
|
||||
|
||||
// 'x-comment' is a privateuse known "locale"
|
||||
{
|
||||
@@ -592,11 +594,11 @@
|
||||
OUString aCanonicalized;
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized) && aCanonicalized == "en-US" );
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized) && aCanonicalized == "x-foobar" );
|
||||
- CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized) && aCanonicalized == "qaa" );
|
||||
+ //CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized) && aCanonicalized == "qaa" );
|
||||
CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "unreg-and-bad", &aCanonicalized) );
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized, true) && aCanonicalized == "en-US" );
|
||||
CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized, true) && aCanonicalized == "x-foobar" );
|
||||
- CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized, true) && aCanonicalized == "qaa" );
|
||||
+ //CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized, true) && aCanonicalized == "qaa" );
|
||||
#if USE_LIBLANGTAG
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-DE" );
|
||||
/* TODO: at least some (those we know) grandfathered tags should be
|
||||
31
libreoffice-4.4.1.2-disable-test2.patch
Normal file
31
libreoffice-4.4.1.2-disable-test2.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
From d0ccb88de3848236b69e5a8e69fa3f29df83515e Sat Jan 24 14:27:11 2015
|
||||
From: Thierry Vignaud <thierry.vignaud@gmail.com>
|
||||
commit d0ccb88de3848236b69e5a8e69fa3f29df83515e
|
||||
Author: rpmbuild <rpmbuild@fedoraproject.org>
|
||||
Date: Sat Jan 24 14:18:18 2015 +0100
|
||||
|
||||
disable a test
|
||||
|
||||
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
|
||||
index 8f6c7d3..304cc0c 100644
|
||||
--- a/sc/qa/unit/ucalc.hxx
|
||||
+++ b/sc/qa/unit/ucalc.hxx
|
||||
@@ -609,7 +609,6 @@ public:
|
||||
CPPUNIT_TEST(testDeleteContents);
|
||||
CPPUNIT_TEST(testTransliterateText);
|
||||
CPPUNIT_TEST(testFormulaToValue);
|
||||
- CPPUNIT_TEST(testFormulaToValue2);
|
||||
CPPUNIT_TEST(testColumnFindEditCells);
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
diff -up ./sw/Module_sw.mk.tv ./sw/Module_sw.mk
|
||||
--- ./sw/Module_sw.mk.tv 2015-01-25 14:45:19.444916038 +0100
|
||||
+++ ./sw/Module_sw.mk 2015-01-25 14:45:32.849915416 +0100
|
||||
@@ -54,7 +54,6 @@ $(eval $(call gb_Module_add_slowcheck_ta
|
||||
CppunitTest_sw_ooxmlexport \
|
||||
CppunitTest_sw_ooxmlexport2 \
|
||||
CppunitTest_sw_ooxmlexport3 \
|
||||
- CppunitTest_sw_ooxmlexport4 \
|
||||
CppunitTest_sw_ooxmlexport5 \
|
||||
CppunitTest_sw_ooxmlfieldexport \
|
||||
CppunitTest_sw_ooxmlsdrexport \
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
diff -urN libreoffice-4.2.5.2-orig/vcl/unx/kde4/KDESalGraphics.cxx libreoffice-4.2.5.2-patched/vcl/unx/kde4/KDESalGraphics.cxx
|
||||
--- libreoffice-4.2.5.2-orig/vcl/unx/kde4/KDESalGraphics.cxx 2013-09-18 03:27:21.000000000 +1100
|
||||
+++ libreoffice-4.2.5.2-patched/vcl/unx/kde4/KDESalGraphics.cxx 2013-09-26 17:51:27.000000000 +1100
|
||||
@@ -163,8 +163,13 @@
|
||||
diff -urN libreoffice-4.4.1.2/vcl/unx/kde4/KDESalGraphics.cxx libreoffice-4.4.1.2-patched/vcl/unx/kde4/KDESalGraphics.cxx
|
||||
--- libreoffice-4.4.1.2/vcl/unx/kde4/KDESalGraphics.cxx 2015-02-21 03:33:24.000000000 +1000
|
||||
+++ libreoffice-4.4.1.2-patched/vcl/unx/kde4/KDESalGraphics.cxx 2015-03-03 18:43:59.757706658 +1000
|
||||
@@ -159,8 +159,13 @@
|
||||
option->state |= state;
|
||||
option->rect = image->rect();
|
||||
|
||||
- QPainter painter(image);
|
||||
- kapp->style()->drawComplexControl(element, option, &painter);
|
||||
- QApplication::style()->drawComplexControl(element, option, &painter);
|
||||
+ // Hack: Don't display tiny useless scrollbars
|
||||
+ // Impress is known to crash when adding effects (segfault is triggered by 15x18 scrollbar)
|
||||
+ if (!((option->type == QStyleOption::SO_Slider) && ((option->rect.width() * option->rect.height()) < 300)))
|
||||
+ {
|
||||
+ QPainter painter(image);
|
||||
+ kapp->style()->drawComplexControl(element, option, &painter);
|
||||
+ QApplication::style()->drawComplexControl(element, option, &painter);
|
||||
+ }
|
||||
}
|
||||
|
||||
|
|
@ -43,19 +43,20 @@
|
|||
Summary: Office suite
|
||||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: 4.3.5
|
||||
Version: 4.4.1
|
||||
%if "%{beta}" != ""
|
||||
Release: 0.%{beta}.1
|
||||
%else
|
||||
Release: 2
|
||||
%endif
|
||||
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
|
||||
Group: Office
|
||||
Url: http://www.libreoffice.org
|
||||
|
||||
Source0: %{relurl}/%{ooname}-%{buildver}.tar.xz
|
||||
Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz
|
||||
Source2: %{relurl}/%{ooname}-help-%{buildver}.tar.xz
|
||||
Source3: %{relurl}/%{ooname}-translations-%{buildver}.tar.xz
|
||||
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
|
||||
Group: Office
|
||||
Url: http://www.libreoffice.org
|
||||
Source4: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
|
||||
Source10: Mandriva-Rosa_Icons.tar.bz2
|
||||
|
|
@ -63,18 +64,17 @@ Source10: Mandriva-Rosa_Icons.tar.bz2
|
|||
Source20: http://archive.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2
|
||||
Source30: %{devurl}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
|
||||
Source31: %{devurl}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
|
||||
Source32: %{devurl}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
|
||||
Source322: %{devurl}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
|
||||
Source321: %{devurl}/e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
|
||||
Source32: %{devurl}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
|
||||
Source321: %{devurl}/commons-logging-1.2-src.tar.gz
|
||||
%endif
|
||||
Source33: %{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
|
||||
Source33: %{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
|
||||
Source34: %{devurl}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
|
||||
Source35: %{devurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
Source36: %{devurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
Source37: %{devurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
|
||||
# External Download Sources
|
||||
Source40: http://hg.services.openoffice.org/binaries/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
|
||||
#Source40: http://hg.services.openoffice.org/binaries/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
|
||||
|
||||
# Extensions
|
||||
Source50: %{srcurl}451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
|
||||
|
|
@ -97,21 +97,20 @@ Source66: %{oxyurl}09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0
|
|||
Source67: %{oxyurl}b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt
|
||||
Source68: %{srcurl}4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
|
||||
Source69: %{srcurl}OpenCOLLADA-master-6509aa13af.tar.bz2
|
||||
Source70: %{srcurl}libgltf/libgltf-0.0.2.tar.bz2
|
||||
Source71: %{srcurl}CoinMP-1.7.6.tgz
|
||||
|
||||
Source1000: libreoffice.rpmlintrc
|
||||
|
||||
Patch0: libreoffice-4.1.0.1-non-fatal-error-during-test.patch
|
||||
Patch0: libreoffice-4.4.1.2-disable-test.patch
|
||||
Patch1: libreoffice-4.2.5-icu-49.patch
|
||||
Patch2: help-images-mdv64789.patch
|
||||
Patch3: 0002-fix-tubes-build.patch
|
||||
Patch4: libreoffice-4.4.1.2-disable-test2.patch
|
||||
|
||||
Patch51: libreoffice-4.2.5.2-impress-kde-crash-hack.patch
|
||||
Patch51: libreoffice-4.4.1.2-impress-kde-crash-hack.patch
|
||||
|
||||
# ROSA vendor patch
|
||||
Patch100: libreoffice-4.1-vendor.patch
|
||||
Patch101: libreoffice-4.2.5.2-desktop-categories.patch
|
||||
Patch102: npapi_h.patch
|
||||
Patch101: libreoffice-4.4.1.2-desktop-categories.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: bsh
|
||||
|
|
@ -176,7 +175,7 @@ BuildRequires: pkgconfig(gnome-vfs-2.0)
|
|||
BuildRequires: pkgconfig(gnutls)
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0)
|
||||
BuildRequires: pkgconfig(graphite2)
|
||||
BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
|
||||
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
|
||||
BuildRequires: pkgconfig(egl)
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(hunspell)
|
||||
|
|
@ -184,12 +183,13 @@ BuildRequires: pkgconfig(icu-le)
|
|||
BuildRequires: pkgconfig(lcms2)
|
||||
BuildRequires: pkgconfig(libabw-0.1)
|
||||
BuildRequires: pkgconfig(libclucene-core)
|
||||
BuildRequires: pkgconfig(libcmis-0.4)
|
||||
BuildRequires: pkgconfig(libcmis-0.5)
|
||||
BuildRequires: pkgconfig(libcurl)
|
||||
BuildRequires: pkgconfig(libcdr-0.1)
|
||||
BuildRequires: pkgconfig(libe-book-0.1)
|
||||
BuildRequires: pkgconfig(libeot)
|
||||
BuildRequires: pkgconfig(libexttextcat)
|
||||
BuildRequires: pkgconfig(libgltf-0.0)
|
||||
BuildRequires: pkgconfig(libixion-0.8)
|
||||
BuildRequires: pkgconfig(liblangtag)
|
||||
BuildRequires: pkgconfig(libmspub-0.1)
|
||||
|
|
@ -271,7 +271,7 @@ formats, including Microsoft Office.
|
|||
Summary: LibreOffice office suite - database
|
||||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
Requires: %{name}-java = %{EVRD}
|
||||
Requires: %{name}-java = %{EVRD}
|
||||
# Require openjdk, we have problems with Oracle Java
|
||||
Requires: java-openjdk
|
||||
|
||||
|
|
@ -322,6 +322,8 @@ Summary: LibreOffice office suite common files
|
|||
Group: Office
|
||||
# Require at least one style to be installed
|
||||
Requires: %{name}-style = %{EVRD}
|
||||
# But force galaxy style because it was used by default
|
||||
Requires: %{name}-style-galaxy = %{EVRD}
|
||||
Suggests: %{name}-help-en_US = %{EVRD}
|
||||
# And then general requires for OOo follows
|
||||
Requires: ghostscript
|
||||
|
|
@ -356,7 +358,6 @@ This package contains the application-independent files of LibreOffice.
|
|||
%{_libdir}/libreoffice/program/classes/ScriptProviderForBeanShell.jar
|
||||
%{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb
|
||||
%{_libdir}/libreoffice/program/mailmerge.py
|
||||
%{_libdir}/libreoffice/share/config/images_galaxy.zip
|
||||
|
||||
%post common
|
||||
# Firefox plugin
|
||||
|
|
@ -383,6 +384,8 @@ fi
|
|||
Summary: Java dependent parts of LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
# (tpg) https://issues.openmandriva.org/show_bug.cgi?id=1056
|
||||
Requires: pentaho-reporting-flow-engine
|
||||
|
||||
%description java
|
||||
Java dependent parts of LibreOffice.
|
||||
|
|
@ -578,6 +581,7 @@ Summary: Default symbol style for LibreOffice
|
|||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
Provides: %{name}-style = %{EVRD}
|
||||
Conflicts: %{name}-common < 1:4.4.1
|
||||
|
||||
%description style-galaxy
|
||||
This package contains the "Galaxy" symbol style from Sun, normally used on
|
||||
|
|
@ -585,7 +589,7 @@ MS Windows (tm) and when not using GNOME or KDE. Needs to be manually enabled
|
|||
in the LibreOffice option menu.
|
||||
|
||||
%files style-galaxy
|
||||
%{ooodir}/share/config/images.zip
|
||||
%{_libdir}/libreoffice/share/config/images_galaxy.zip
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -2989,10 +2993,10 @@ Files used by LibreOffice templates.
|
|||
%{ooodir}/share/template/common/layout/texture-*.jpg.otp
|
||||
%{ooodir}/share/template/common/layout/vortrag_*.otp
|
||||
%{ooodir}/share/template/common/misc
|
||||
%{ooodir}/share/template/common/officorr
|
||||
%{ooodir}/share/template/common/offimisc
|
||||
%{ooodir}/share/template/common/personal
|
||||
%{ooodir}/share/template/common/presnt
|
||||
%{ooodir}/share/template/common/officorr/dummy_common_templates.txt
|
||||
%{ooodir}/share/template/common/offimisc/dummy_common_templates.txt
|
||||
%{ooodir}/share/template/common/personal/szivesoldal.otg
|
||||
%{ooodir}/share/template/common/presnt/dummy_common_templates.txt
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -3242,26 +3246,28 @@ tar -xjvf %{SOURCE20}
|
|||
mkdir -p ~/tmp
|
||||
chmod 777 ~/tmp
|
||||
|
||||
%build
|
||||
# 4.4.1.2 specific
|
||||
chmod +x bin/unpack-sources
|
||||
|
||||
%build
|
||||
# Workaround for bug http://qa.mandriva.com/show_bug.cgi?id=27771
|
||||
# if [ -z $QTDIR ]; then
|
||||
# . /etc/profile.d/60qt4.sh
|
||||
# fi
|
||||
export QT4DIR=%{_libdir}/qt4
|
||||
%ifarch X86_64
|
||||
%ifarch X86_64
|
||||
export QT4INC=/usr/lib/qt4/include
|
||||
%else
|
||||
export QT4INC=%{_libdir}/qt4/include
|
||||
%endif
|
||||
%endif
|
||||
export QT4LIB=%{_libdir}/qt4/lib
|
||||
|
||||
export KDE4DIR=%{_libdir}/kde4
|
||||
%ifarch X86_64
|
||||
%ifarch X86_64
|
||||
export KDE4INC=/usr/lib/kde4/include
|
||||
%else
|
||||
export KDE4INC=%{_libdir}/kde4/include
|
||||
%endif
|
||||
%endif
|
||||
export KDE4LIB=%{_libdir}/kde4/lib
|
||||
|
||||
export LC_ALL=en_US.UTF-8
|
||||
|
|
@ -3278,6 +3284,7 @@ export PATH
|
|||
export CCACHE_DIR=%{ccachedir}
|
||||
%endif
|
||||
|
||||
%global optflags %optflags -Wstrict-aliasing=0
|
||||
export ARCH_FLAGS="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing"
|
||||
export ARCH_FLAGS_CC="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing"
|
||||
export ARCH_FLAGS_CXX="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden"
|
||||
|
|
@ -3293,9 +3300,10 @@ touch autogen.lastrun
|
|||
%{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \
|
||||
--with-vendor=ROSA \
|
||||
--with-build-version="ROSA %{version}-%{release}" \
|
||||
--disable-coinmp \
|
||||
--disable-fetch-external \
|
||||
--enable-gstreamer-0.10 \
|
||||
--disable-gstreamer \
|
||||
--enable-gstreamer-1.0 \
|
||||
--disable-gstreamer-0.10 \
|
||||
--enable-release-build \
|
||||
--disable-kde \
|
||||
--enable-kde4 \
|
||||
|
|
@ -3314,7 +3322,7 @@ touch autogen.lastrun
|
|||
--without-junit \
|
||||
%if %{javaless}
|
||||
--with-ant-home="%{antpath}" \
|
||||
--without-system-apache-commons \
|
||||
--without-system-apache-commons \
|
||||
%endif
|
||||
--with-lang="%{langs}" \
|
||||
--without-myspell-dicts \
|
||||
|
|
@ -3325,6 +3333,7 @@ touch autogen.lastrun
|
|||
--with-external-thes-dir=%{_datadir}/dict/ooo \
|
||||
--with-system-libs \
|
||||
--with-system-ucpp \
|
||||
--without-system-npapi-headers \
|
||||
--enable-ext-watch-window \
|
||||
--enable-ext-diagram \
|
||||
--enable-ext-validator \
|
||||
|
|
@ -3365,8 +3374,8 @@ echo "Make start at: "`date` >> ooobuildtime.log
|
|||
# http://wiki.services.openoffice.org/wiki/Building_OpenOffice.org
|
||||
# needs to check if it does any effect
|
||||
export nodep=TRUE
|
||||
export NO_HIDS=TRUE
|
||||
export MAXPROCESS=4
|
||||
export NO_HIDS=TRUE
|
||||
export MAXPROCESS=4
|
||||
|
||||
mkdir -p external/tarballs
|
||||
ln -sf %{SOURCE2} external/tarballs/
|
||||
|
|
@ -3377,8 +3386,8 @@ cp %{SOURCE4} external/tarballs/
|
|||
ln -sf %{SOURCE30} external/tarballs/
|
||||
ln -sf %{SOURCE31} external/tarballs/
|
||||
ln -sf %{SOURCE32} external/tarballs/
|
||||
ln -sf %{SOURCE32} external/tarballs/
|
||||
ln -sf %{SOURCE321} external/tarballs/
|
||||
ln -sf %{SOURCE322} external/tarballs/
|
||||
%endif
|
||||
|
||||
ln -sf %{SOURCE33} external/tarballs/
|
||||
|
|
@ -3387,7 +3396,7 @@ ln -sf %{SOURCE35} external/tarballs/
|
|||
ln -sf %{SOURCE36} external/tarballs/
|
||||
ln -sf %{SOURCE37} external/tarballs/
|
||||
|
||||
ln -sf %{SOURCE40} external/tarballs/
|
||||
#ln -sf %{SOURCE40} external/tarballs/
|
||||
|
||||
ln -sf %{SOURCE50} external/tarballs/
|
||||
ln -sf %{SOURCE51} external/tarballs/
|
||||
|
|
@ -3409,9 +3418,6 @@ ln -sf %{SOURCE66} external/tarballs/
|
|||
ln -sf %{SOURCE67} external/tarballs/
|
||||
ln -sf %{SOURCE68} external/tarballs/
|
||||
ln -sf %{SOURCE69} external/tarballs/
|
||||
ln -sf %{SOURCE70} external/tarballs/
|
||||
ln -sf %{SOURCE71} external/tarballs/
|
||||
# ln -sf %{SOURCE72} external/tarballs/
|
||||
|
||||
touch external/tarballs/.downloaded
|
||||
|
||||
|
|
@ -3429,10 +3435,6 @@ make -r -s V=0 \
|
|||
echo "Make end at: "`date` >> ooobuildtime.log
|
||||
echo "Install start at: "`date` >> ooobuildtime.log
|
||||
|
||||
%check
|
||||
# FIXME enable once the connection failures in firebird and hsqldb are fixed
|
||||
# make check
|
||||
|
||||
%install
|
||||
# sbin due to icu stuff there
|
||||
PATH=$PATH:/usr/sbin
|
||||
|
|
@ -3545,3 +3547,8 @@ done)}
|
|||
echo "%%{_libdir}/libreoffice/help/$i";
|
||||
done)}
|
||||
%endif
|
||||
|
||||
%check
|
||||
# FIXME enable once the connection failures in firebird and hsqldb are fixed
|
||||
# make check
|
||||
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
--- libreoffice-4.3.1/external/np_sdk/npsdk/npunix.c.orig 2014-08-14 15:57:15.387000000 +0400
|
||||
+++ libreoffice-4.3.1/external/np_sdk/npsdk/npunix.c 2014-08-14 15:57:29.099000000 +0400
|
||||
@@ -56,7 +56,7 @@
|
||||
#define XP_UNIX 1
|
||||
|
||||
#include <stdio.h>
|
||||
-#include "npapi.h"
|
||||
+#include "../inc/npapi.h"
|
||||
#include "npupp.h"
|
||||
#include "plugin.h"
|
||||
|
||||
--- libreoffice-4.3.1/external/np_sdk/npsdk/npupp.h.orig 2014-08-14 15:46:42.650000000 +0400
|
||||
+++ libreoffice-4.3.1/external/np_sdk/npsdk/npupp.h 2014-08-14 15:56:45.554000000 +0400
|
||||
@@ -48,8 +48,14 @@
|
||||
#define GENERATINGCFM 0
|
||||
#endif
|
||||
|
||||
-#ifndef _NPAPI_H_
|
||||
-#include "npapi.h"
|
||||
+#ifndef npapi_h_
|
||||
+#include "../inc/npapi.h"
|
||||
+#endif
|
||||
+
|
||||
+#if defined(__OS2__)
|
||||
+#define NP_LOADDS _System
|
||||
+#else
|
||||
+#define NP_LOADDS
|
||||
#endif
|
||||
|
||||
#include "jri.h"
|
||||
--- libreoffice-4.3.1/external/np_sdk/npsdk/npwin.cxx.orig 2014-08-14 15:44:23.643000000 +0400
|
||||
+++ libreoffice-4.3.1/external/np_sdk/npsdk/npwin.cxx 2014-08-14 15:44:46.609000000 +0400
|
||||
@@ -35,7 +35,7 @@
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
-#include "npapi.h"
|
||||
+#include "../inc/npapi.h"
|
||||
#include "npupp.h"
|
||||
#include "plugin.h"
|
||||
|
||||
--- libreoffice-4.3.1/external/np_sdk/npsdk/plugin.h.orig 2014-08-14 15:48:07.948000000 +0400
|
||||
+++ libreoffice-4.3.1/external/np_sdk/npsdk/plugin.h 2014-08-14 15:56:04.674000000 +0400
|
||||
@@ -20,7 +20,13 @@
|
||||
#ifndef INCLUDED_NP_SDK_MOZSRC_PLUGIN_H
|
||||
#define INCLUDED_NP_SDK_MOZSRC_PLUGIN_H
|
||||
|
||||
-#include "npapi.h"
|
||||
+#include "../inc/npapi.h"
|
||||
+
|
||||
+#if defined(__OS2__)
|
||||
+#define NP_LOADDS _System
|
||||
+#else
|
||||
+#define NP_LOADDS
|
||||
+#endif
|
||||
|
||||
/* OpenOffice.org/LibreOffice modified the implementations of NP_Initialize and
|
||||
NP_Shutdown in external/np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp.,
|
||||
Loading…
Add table
Reference in a new issue