mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 10:32:59 +00:00
New version 5.0.3.2
Drop disable-test patches Re-diff help-images and desktop-categories patches Drop merged tubes patch
This commit is contained in:
Andrey Bondrov
parent
63901b8e17
commit
930bb2a10f
7 changed files with 36 additions and 147 deletions
8
.abf.yml
8
.abf.yml
|
|
@ -31,7 +31,7 @@ sources:
|
|||
b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08
|
||||
b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389
|
||||
bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt: c89331a8d7642429f4fe3ffe07ee6d675f99561a
|
||||
libreoffice-4.4.5.2.tar.xz: dca6d5f31facfa28661909700e1eba5e69da9d2a
|
||||
libreoffice-dictionaries-4.4.5.2.tar.xz: 1d5844b77cae947f1827bc520d376faf59c43dd5
|
||||
libreoffice-help-4.4.5.2.tar.xz: b6e28c5944072a478237c97188dbbdd5a271c867
|
||||
libreoffice-translations-4.4.5.2.tar.xz: fd2acb72f1109f78d38663f3089f48c7aebbea8c
|
||||
libreoffice-5.0.3.2.tar.xz: 8981b8b975679038b72717f0b9921791cc7886ab
|
||||
libreoffice-dictionaries-5.0.3.2.tar.xz: e906f96a5fd95691b0bcf0e733c00f594b9563e5
|
||||
libreoffice-help-5.0.3.2.tar.xz: bd311a0d2792eeecbf0699d650abf59711c1b8c1
|
||||
libreoffice-translations-5.0.3.2.tar.xz: 259d57db2e26d5c00ea35d8a8d2dba420d70449e
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
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,15 +1,7 @@
|
|||
--- libreoffice-4.2.0/xmlhelp/source/cxxhelp/provider/databases.cxx.0002~ 2013-12-26 21:26:49.437106220 +0100
|
||||
+++ libreoffice-4.2.0/xmlhelp/source/cxxhelp/provider/databases.cxx 2013-12-26 21:50:44.007125053 +0100
|
||||
@@ -274,7 +274,7 @@ OString Databases::getImagesZipFileURL()
|
||||
|
||||
if ( !aSymbolsStyleName.isEmpty() )
|
||||
{
|
||||
- if ( aSymbolsStyleName.equalsAscii("auto") )
|
||||
+ if ( aSymbolsStyleName.equalsAscii("auto") || aSymbolsStyleName.equalsAscii("default") )
|
||||
{
|
||||
OUString const & env = Application::GetDesktopEnvironment();
|
||||
if ( env.equalsIgnoreAsciiCase("tde") ||
|
||||
@@ -290,10 +290,23 @@ OString Databases::getImagesZipFileURL()
|
||||
diff -urN libreoffice-5.0.3-orig/xmlhelp/source/cxxhelp/provider/databases.cxx libreoffice-5.0.3-patched/xmlhelp/source/cxxhelp/provider/databases.cxx
|
||||
--- libreoffice-5.0.3-orig/xmlhelp/source/cxxhelp/provider/databases.cxx 2015-10-25 01:21:49.000000000 +1000
|
||||
+++ libreoffice-5.0.3-patched/xmlhelp/source/cxxhelp/provider/databases.cxx 2015-12-16 15:54:02.804841364 +1000
|
||||
@@ -289,6 +289,19 @@
|
||||
bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
|
||||
}
|
||||
|
||||
|
|
@ -20,16 +12,12 @@
|
|||
+ if ( ! bFound )
|
||||
+ bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images_crystal.zip" ), aImageZip );
|
||||
+
|
||||
if ( ! bFound )
|
||||
bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip );
|
||||
|
||||
if ( ! bFound )
|
||||
+ if ( ! bFound )
|
||||
+ bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images_tango.zip" ), aImageZip );
|
||||
+
|
||||
+ if ( ! bFound )
|
||||
+ bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images_hicontrast.zip" ), aImageZip );
|
||||
+
|
||||
+ if ( ! bFound )
|
||||
aImageZip = "";
|
||||
if ( ! bFound )
|
||||
bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip );
|
||||
|
||||
m_aImagesZipFileURL = OUStringToOString(
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
diff -urN libreoffice-4.4.2.2/sc/qa/unit/ucalc.hxx libreoffice-4.4.2.2-patched/sc/qa/unit/ucalc.hxx
|
||||
--- libreoffice-4.4.2.2/sc/qa/unit/ucalc.hxx 2015-03-26 21:51:14.000000000 +1000
|
||||
+++ libreoffice-4.4.2.2-patched/sc/qa/unit/ucalc.hxx 2015-04-03 19:51:08.957032882 +1000
|
||||
@@ -616,7 +616,6 @@
|
||||
CPPUNIT_TEST(testDeleteContents);
|
||||
CPPUNIT_TEST(testTransliterateText);
|
||||
CPPUNIT_TEST(testFormulaToValue);
|
||||
- CPPUNIT_TEST(testFormulaToValue2);
|
||||
CPPUNIT_TEST(testColumnFindEditCells);
|
||||
CPPUNIT_TEST(testCopyPasteMatrixFormula);
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
diff -urN libreoffice-4.4.2.2/sw/Module_sw.mk libreoffice-4.4.2.2-patched/sw/Module_sw.mk
|
||||
--- libreoffice-4.4.2.2/sw/Module_sw.mk 2015-03-26 21:51:14.000000000 +1000
|
||||
+++ libreoffice-4.4.2.2-patched/sw/Module_sw.mk 2015-04-03 19:51:09.003032880 +1000
|
||||
@@ -54,7 +54,6 @@
|
||||
CppunitTest_sw_ooxmlexport \
|
||||
CppunitTest_sw_ooxmlexport2 \
|
||||
CppunitTest_sw_ooxmlexport3 \
|
||||
- CppunitTest_sw_ooxmlexport4 \
|
||||
CppunitTest_sw_ooxmlexport5 \
|
||||
CppunitTest_sw_ooxmlfieldexport \
|
||||
CppunitTest_sw_ooxmlsdrexport \
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
diff -urN libreoffice-5.0.3/sysui/desktop/menus/base.desktop libreoffice-5.0.3-patched/sysui/desktop/menus/base.desktop
|
||||
--- libreoffice-5.0.3/sysui/desktop/menus/base.desktop 2015-10-25 01:21:49.000000000 +1000
|
||||
+++ libreoffice-5.0.3-patched/sysui/desktop/menus/base.desktop 2015-12-16 16:49:05.590991664 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=base
|
||||
|
|
@ -10,9 +10,9 @@ diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/base.desktop libreoffice-4.4.1
|
|||
Exec=${UNIXBASISROOTNAME} --base %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
|
||||
Name=%PRODUCTNAME Base
|
||||
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
|
||||
diff -urN libreoffice-5.0.3/sysui/desktop/menus/calc.desktop libreoffice-5.0.3-patched/sysui/desktop/menus/calc.desktop
|
||||
--- libreoffice-5.0.3/sysui/desktop/menus/calc.desktop 2015-10-25 01:21:49.000000000 +1000
|
||||
+++ libreoffice-5.0.3-patched/sysui/desktop/menus/calc.desktop 2015-12-16 16:49:05.590991664 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=calc
|
||||
|
|
@ -20,11 +20,11 @@ diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/calc.desktop libreoffice-4.4.1
|
|||
-Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
|
||||
+Categories=Office;Spreadsheet;
|
||||
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;
|
||||
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;application/x-iwork-numbers-sffnumbers;
|
||||
Name=%PRODUCTNAME Calc
|
||||
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
|
||||
diff -urN libreoffice-5.0.3/sysui/desktop/menus/draw.desktop libreoffice-5.0.3-patched/sysui/desktop/menus/draw.desktop
|
||||
--- libreoffice-5.0.3/sysui/desktop/menus/draw.desktop 2015-10-25 01:21:49.000000000 +1000
|
||||
+++ libreoffice-5.0.3-patched/sysui/desktop/menus/draw.desktop 2015-12-16 16:49:05.590991664 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=draw
|
||||
|
|
@ -34,9 +34,9 @@ diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/draw.desktop libreoffice-4.4.1
|
|||
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;application/x-pagemaker;
|
||||
Name=%PRODUCTNAME Draw
|
||||
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
|
||||
diff -urN libreoffice-5.0.3/sysui/desktop/menus/impress.desktop libreoffice-5.0.3-patched/sysui/desktop/menus/impress.desktop
|
||||
--- libreoffice-5.0.3/sysui/desktop/menus/impress.desktop 2015-10-25 01:21:49.000000000 +1000
|
||||
+++ libreoffice-5.0.3-patched/sysui/desktop/menus/impress.desktop 2015-12-16 16:49:05.591991664 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=impress
|
||||
|
|
@ -46,9 +46,9 @@ diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/impress.desktop libreoffice-4.
|
|||
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 -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
|
||||
diff -urN libreoffice-5.0.3/sysui/desktop/menus/math.desktop libreoffice-5.0.3-patched/sysui/desktop/menus/math.desktop
|
||||
--- libreoffice-5.0.3/sysui/desktop/menus/math.desktop 2015-10-25 01:21:49.000000000 +1000
|
||||
+++ libreoffice-5.0.3-patched/sysui/desktop/menus/math.desktop 2015-12-16 16:49:05.591991664 +1000
|
||||
@@ -21,7 +21,7 @@
|
||||
NoDisplay=false
|
||||
Icon=math
|
||||
|
|
@ -58,9 +58,9 @@ diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/math.desktop libreoffice-4.4.1
|
|||
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 -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
|
||||
diff -urN libreoffice-5.0.3/sysui/desktop/menus/startcenter.desktop libreoffice-5.0.3-patched/sysui/desktop/menus/startcenter.desktop
|
||||
--- libreoffice-5.0.3/sysui/desktop/menus/startcenter.desktop 2015-10-25 01:21:49.000000000 +1000
|
||||
+++ libreoffice-5.0.3-patched/sysui/desktop/menus/startcenter.desktop 2015-12-16 16:49:05.592991664 +1000
|
||||
@@ -18,10 +18,10 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
|
|
@ -74,9 +74,9 @@ diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/startcenter.desktop libreoffic
|
|||
Exec=${UNIXBASISROOTNAME} %%FILE%%
|
||||
MimeType=application/vnd.openofficeorg.extension;
|
||||
Name=%PRODUCTNAME
|
||||
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
|
||||
diff -urN libreoffice-5.0.3/sysui/desktop/menus/writer.desktop libreoffice-5.0.3-patched/sysui/desktop/menus/writer.desktop
|
||||
--- libreoffice-5.0.3/sysui/desktop/menus/writer.desktop 2015-10-25 01:21:49.000000000 +1000
|
||||
+++ libreoffice-5.0.3-patched/sysui/desktop/menus/writer.desktop 2015-12-16 16:49:05.592991664 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=writer
|
||||
|
|
@ -84,5 +84,5 @@ diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/writer.desktop libreoffice-4.4
|
|||
-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.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;
|
||||
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;application/x-iwork-pages-sffpages;
|
||||
Name=%PRODUCTNAME Writer
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
Summary: Office suite
|
||||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: 4.4.5
|
||||
Version: 5.0.3
|
||||
%if "%{beta}" != ""
|
||||
Release: 0.%{beta}.1
|
||||
%else
|
||||
|
|
@ -99,17 +99,14 @@ Source69: %{srcurl}OpenCOLLADA-master-6509aa13af.tar.bz2
|
|||
|
||||
Source1000: libreoffice.rpmlintrc
|
||||
|
||||
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.2.2-disable-test2.patch
|
||||
|
||||
Patch51: libreoffice-4.4.1.2-impress-kde-crash-hack.patch
|
||||
|
||||
# ROSA vendor patch
|
||||
Patch100: libreoffice-4.1-vendor.patch
|
||||
Patch101: libreoffice-4.4.1.2-desktop-categories.patch
|
||||
Patch101: libreoffice-5.0.3.2-desktop-categories.patch
|
||||
Patch102: libreoffice-4.4.2.2-desktop-protocols.patch
|
||||
|
||||
BuildRequires: bison
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue