New version 5.1.1.3

Add new icons style breeze
Move sifr icons style from common to individual subpackage
Drop obsolete crystal icons style
Disable deprecated and broken telepathy support
Disable gobject introspection (wasn't enabled in previous releases)
Add appdata files
This commit is contained in:
Andrey Bondrov 2016-04-04 18:59:06 +10:00
parent 3d524b6130
commit 69502c4dbb
8 changed files with 123 additions and 166 deletions

View file

@ -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

View file

@ -1,35 +0,0 @@
--- 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()
bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
}
+ // Fallbacks in case the configured style file was not found
+ if ( ! bFound )
+ bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images_oxygen.zip" ), aImageZip );
+
+ 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 )
+ 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 = "";
m_aImagesZipFileURL = OUStringToOString(

View file

@ -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 \

View file

@ -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 diff -urN libreoffice-5.1.1.3/sysui/desktop/menus/base.desktop libreoffice-5.1.1.3-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-5.1.1.3/sysui/desktop/menus/base.desktop 2016-03-01 02:20:43.000000000 +0300
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/base.desktop 2015-03-03 19:03:23.493759616 +1000 +++ libreoffice-5.1.1.3-patched/sysui/desktop/menus/base.desktop 2016-03-18 07:15:03.142902518 +0300
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
Terminal=false Terminal=false
Icon=base 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%% Exec=${UNIXBASISROOTNAME} --base %%FILE%%
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
Name=%PRODUCTNAME 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 diff -urN libreoffice-5.1.1.3/sysui/desktop/menus/calc.desktop libreoffice-5.1.1.3-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-5.1.1.3/sysui/desktop/menus/calc.desktop 2016-03-01 02:20:43.000000000 +0300
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/calc.desktop 2015-03-03 19:03:23.494759616 +1000 +++ libreoffice-5.1.1.3-patched/sysui/desktop/menus/calc.desktop 2016-03-18 07:14:48.941738740 +0300
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
Terminal=false Terminal=false
Icon=calc 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;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
+Categories=Office;Spreadsheet; +Categories=Office;Spreadsheet;
Exec=${UNIXBASISROOTNAME} --calc %%FILE%% 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 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 diff -urN libreoffice-5.1.1.3/sysui/desktop/menus/draw.desktop libreoffice-5.1.1.3-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-5.1.1.3/sysui/desktop/menus/draw.desktop 2016-03-01 02:20:43.000000000 +0300
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/draw.desktop 2015-03-03 19:03:23.495759616 +1000 +++ libreoffice-5.1.1.3-patched/sysui/desktop/menus/draw.desktop 2016-03-18 07:14:35.974588856 +0300
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
Terminal=false Terminal=false
Icon=draw 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%% 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; 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 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 diff -urN libreoffice-5.1.1.3/sysui/desktop/menus/impress.desktop libreoffice-5.1.1.3-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-5.1.1.3/sysui/desktop/menus/impress.desktop 2016-03-01 02:20:43.000000000 +0300
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/impress.desktop 2015-03-03 19:03:23.495759616 +1000 +++ libreoffice-5.1.1.3-patched/sysui/desktop/menus/impress.desktop 2016-03-18 07:14:22.094428040 +0300
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
Terminal=false Terminal=false
Icon=impress Icon=impress
@ -46,37 +46,33 @@ diff -urN libreoffice-4.4.1.2/sysui/desktop/menus/impress.desktop libreoffice-4.
Exec=${UNIXBASISROOTNAME} --impress %%FILE%% 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; 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 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 diff -urN libreoffice-5.1.1.3/sysui/desktop/menus/math.desktop libreoffice-5.1.1.3-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-5.1.1.3/sysui/desktop/menus/math.desktop 2016-03-01 02:20:43.000000000 +0300
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/math.desktop 2015-03-03 19:03:23.496759616 +1000 +++ libreoffice-5.1.1.3-patched/sysui/desktop/menus/math.desktop 2016-03-18 07:14:08.205266707 +0300
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
NoDisplay=false NoDisplay=false
Icon=math Icon=math
Type=Application Type=Application
-Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; -Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
+Categories=Science;Math; +Categories=Office;Math;
Exec=${UNIXBASISROOTNAME} --math %%FILE%% 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; 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 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 diff -urN libreoffice-5.1.1.3/sysui/desktop/menus/startcenter.desktop libreoffice-5.1.1.3-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-5.1.1.3/sysui/desktop/menus/startcenter.desktop 2016-03-01 02:20:43.000000000 +0300
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/startcenter.desktop 2015-03-03 19:03:23.496759616 +1000 +++ libreoffice-5.1.1.3-patched/sysui/desktop/menus/startcenter.desktop 2016-03-18 07:13:38.369918645 +0300
@@ -18,10 +18,10 @@ @@ -21,7 +21,7 @@
[Desktop Entry] NoDisplay=false
Version=1.0
Terminal=false
-NoDisplay=false
+NoDisplay=true
Icon=startcenter Icon=startcenter
Type=Application Type=Application
-Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
+Categories=Office; +Categories=Office;
Exec=${UNIXBASISROOTNAME} %%FILE%% Exec=${UNIXBASISROOTNAME} %%FILE%%
MimeType=application/vnd.openofficeorg.extension; MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis;
Name=%PRODUCTNAME 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 diff -urN libreoffice-5.1.1.3/sysui/desktop/menus/writer.desktop libreoffice-5.1.1.3-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-5.1.1.3/sysui/desktop/menus/writer.desktop 2016-03-01 02:20:43.000000000 +0300
+++ libreoffice-4.4.1.2-patched/sysui/desktop/menus/writer.desktop 2015-03-03 19:03:23.497759616 +1000 +++ libreoffice-5.1.1.3-patched/sysui/desktop/menus/writer.desktop 2016-03-18 07:11:25.731339709 +0300
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
Terminal=false Terminal=false
Icon=writer Icon=writer
@ -84,5 +80,6 @@ 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;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
+Categories=Office;WordProcessor; +Categories=Office;WordProcessor;
Exec=${UNIXBASISROOTNAME} --writer %%FILE%% 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;application/x-mswrite;
Name=%PRODUCTNAME Writer Name=%PRODUCTNAME Writer

View file

@ -0,0 +1,16 @@
diff -urN libreoffice-5.1.1.3/dbaccess/Module_dbaccess.mk libreoffice-5.1.1.3-patched/dbaccess/Module_dbaccess.mk
--- libreoffice-5.1.1.3/dbaccess/Module_dbaccess.mk 2016-03-01 09:20:43.000000000 +1000
+++ libreoffice-5.1.1.3-patched/dbaccess/Module_dbaccess.mk 2016-04-03 02:28:30.927935547 +1000
@@ -34,12 +34,6 @@
UIConfig_dbtdata \
))
-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
-$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_firebird_test \
-))
-endif
-
$(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_dialog_save \
CppunitTest_dbaccess_empty_stdlib_save \

View file

@ -0,0 +1,16 @@
diff -urN libreoffice-5.1.1.3/dbaccess/Module_dbaccess.mk libreoffice-5.1.1.3-patched/dbaccess/Module_dbaccess.mk
--- libreoffice-5.1.1.3/dbaccess/Module_dbaccess.mk 2016-03-01 09:20:43.000000000 +1000
+++ libreoffice-5.1.1.3-patched/dbaccess/Module_dbaccess.mk 2016-04-03 02:25:16.465949490 +1000
@@ -49,12 +49,6 @@
CppunitTest_dbaccess_RowSetClones) \
))
-ifeq ($(ENABLE_JAVA),TRUE)
-$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_hsqldb_test \
-))
-endif
-
# This runs a suite of peformance tests on embedded firebird and HSQLDB.
# Instructions on running the test can be found in qa/unit/embeddedb_performancetest
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)

View file

@ -1,7 +1,7 @@
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 diff -urN libreoffice-5.1.1.3/i18nlangtag/qa/cppunit/test_languagetag.cxx libreoffice-5.1.1.3-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-5.1.1.3/i18nlangtag/qa/cppunit/test_languagetag.cxx 2016-03-01 09:20:43.000000000 +1000
+++ libreoffice-4.4.1.2-patched/i18nlangtag/qa/cppunit/test_languagetag.cxx 2015-03-04 01:56:51.000000000 +1000 +++ libreoffice-5.1.1.3-patched/i18nlangtag/qa/cppunit/test_languagetag.cxx 2016-04-02 20:29:23.210480495 +1000
@@ -487,6 +487,7 @@ @@ -506,6 +506,7 @@
CPPUNIT_ASSERT( qtz.getLanguageType() == LANGUAGE_USER_KEYID ); CPPUNIT_ASSERT( qtz.getLanguageType() == LANGUAGE_USER_KEYID );
} }
@ -9,25 +9,25 @@ diff -urN libreoffice-4.4.1.2/i18nlangtag/qa/cppunit/test_languagetag.cxx libreo
// 'qty' is a local use unknown locale // 'qty' is a local use unknown locale
{ {
OUString s_qty( "qty" ); OUString s_qty( "qty" );
@@ -498,6 +499,7 @@ @@ -517,6 +518,7 @@
CPPUNIT_ASSERT( aLocale.Variant == "" ); CPPUNIT_ASSERT( aLocale.Variant.isEmpty() );
CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( qty.getLanguageType()) ); CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( qty.getLanguageType()) );
} }
+#endif +#endif
// 'x-comment' is a privateuse known "locale" // 'x-comment' is a privateuse known "locale"
{ {
@@ -592,11 +594,11 @@ @@ -611,11 +613,11 @@
OUString aCanonicalized; OUString aCanonicalized;
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized) && aCanonicalized == "en-US" ); CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized) && aCanonicalized == "en-US" );
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized) && aCanonicalized == "x-foobar" ); 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( "qaa", &aCanonicalized) && aCanonicalized == "qaa" ); + // CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized) && aCanonicalized == "qaa" );
CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "unreg-and-bad", &aCanonicalized) ); CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "unreg-and-bad", &aCanonicalized) );
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized, true) && aCanonicalized == "en-US" ); 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( "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" );
+ //CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized, true) && aCanonicalized == "qaa" ); + // CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized, true) && aCanonicalized == "qaa" );
#if USE_LIBLANGTAG #if ENABLE_LIBLANGTAG
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-DE" ); CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-DE" );
/* TODO: at least some (those we know) grandfathered tags should be /* TODO: at least some (those we know) grandfathered tags should be

View file

@ -25,7 +25,7 @@
%define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/ %define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/
%define distroname ROSA %define distroname ROSA
%define ooname libreoffice %define ooname libreoffice
%define buildver %{version}.2 %define buildver %{version}.3
%define ooodir %{_libdir}/libreoffice %define ooodir %{_libdir}/libreoffice
%define antpath %{_builddir}/libreoffice-%{version}/apache-ant-1.8.1 %define antpath %{_builddir}/libreoffice-%{version}/apache-ant-1.8.1
@ -42,11 +42,11 @@
Summary: Office suite Summary: Office suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: 4.4.7 Version: 5.1.1
%if "%{beta}" != "" %if "%{beta}" != ""
Release: 0.%{beta}.1 Release: 0.%{beta}.1
%else %else
Release: 2 Release: 4
%endif %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 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 Group: Office
@ -100,17 +100,17 @@ Source70: %{srcurl}1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.ox
Source1000: libreoffice.rpmlintrc Source1000: libreoffice.rpmlintrc
Patch0: libreoffice-4.4.1.2-disable-test.patch Patch0: libreoffice-5.1.1.3-disable-test-languagetag.patch
Patch1: libreoffice-4.2.5-icu-49.patch Patch1: libreoffice-4.2.5-icu-49.patch
Patch2: help-images-mdv64789.patch Patch2: libreoffice-5.1.1.3-disable-test-hsqldb.patch
Patch3: 0002-fix-tubes-build.patch Patch3: libreoffice-5.1.1.3-disable-test-firebird.patch
Patch4: libreoffice-4.4.2.2-disable-test2.patch #Patch4: libreoffice-4.4.2.2-disable-test2.patch
Patch51: libreoffice-4.4.1.2-impress-kde-crash-hack.patch Patch51: libreoffice-4.4.1.2-impress-kde-crash-hack.patch
# ROSA vendor patch # ROSA vendor patch
Patch100: libreoffice-4.1-vendor.patch Patch100: libreoffice-4.1-vendor.patch
Patch101: libreoffice-4.4.1.2-desktop-categories.patch Patch101: libreoffice-5.1.1.3-desktop-categories.patch
Patch102: libreoffice-4.4.2.2-desktop-protocols.patch Patch102: libreoffice-4.4.2.2-desktop-protocols.patch
BuildRequires: bison BuildRequires: bison
@ -131,6 +131,7 @@ BuildRequires: icecream
%endif %endif
BuildRequires: icu BuildRequires: icu
BuildRequires: imagemagick BuildRequires: imagemagick
BuildRequires: locales-en
BuildRequires: pentaho-libxml BuildRequires: pentaho-libxml
BuildRequires: pentaho-reporting-flow-engine BuildRequires: pentaho-reporting-flow-engine
BuildRequires: perl-Archive-Zip BuildRequires: perl-Archive-Zip
@ -148,11 +149,11 @@ BuildRequires: xsltproc >= 1.0.19
BuildRequires: zip BuildRequires: zip
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: db-devel
BuildRequires: glm-devel BuildRequires: glm-devel
BuildRequires: hyphen-devel BuildRequires: hyphen-devel
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: kdelibs4-devel BuildRequires: kdelibs4-devel
BuildRequires: libwps-devel
BuildRequires: lpsolve-devel BuildRequires: lpsolve-devel
BuildRequires: mysql-connector-c++-devel BuildRequires: mysql-connector-c++-devel
BuildRequires: nas-devel BuildRequires: nas-devel
@ -170,6 +171,7 @@ BuildRequires: pkgconfig(libetonyek-0.1)
BuildRequires: pkgconfig(libfreehand-0.1) BuildRequires: pkgconfig(libfreehand-0.1)
BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glew)
BuildRequires: pkgconfig(glitz) BuildRequires: pkgconfig(glitz)
BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(gnome-vfs-2.0) BuildRequires: pkgconfig(gnome-vfs-2.0)
@ -196,9 +198,10 @@ BuildRequires: pkgconfig(liblangtag)
BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmspub-0.1)
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.4 BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.4
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.0 BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.0
BuildRequires: pkgconfig(liborcus-0.8) >= 0.7.0 BuildRequires: pkgconfig(liborcus-0.10) >= 0.7.0
BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libpq)
BuildRequires: pkgconfig(librevenge-0.0)
BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libstartup-notification-1.0)
BuildRequires: pkgconfig(libsvg) BuildRequires: pkgconfig(libsvg)
@ -206,6 +209,7 @@ BuildRequires: pkgconfig(libucpp)
BuildRequires: pkgconfig(libvisio-0.1) BuildRequires: pkgconfig(libvisio-0.1)
BuildRequires: pkgconfig(libwpd-0.10) BuildRequires: pkgconfig(libwpd-0.10)
BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwpg-0.3)
BuildRequires: pkgconfig(libwps-0.4)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(libxul) BuildRequires: pkgconfig(libxul)
@ -224,15 +228,10 @@ BuildRequires: pkgconfig(rasqal)
BuildRequires: pkgconfig(redland) BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends) BuildRequires: pkgconfig(sane-backends)
BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(telepathy-glib)
BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xaw7)
BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xpm)
BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
BuildRequires: db-devel
BuildRequires: locales-en
BuildRequires: pkgconfig(librevenge-0.0)
BuildRequires: pkgconfig(glew)
%if !%{javaless} %if !%{javaless}
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-apache-regexp BuildRequires: ant-apache-regexp
@ -301,6 +300,7 @@ packages:
%{_mandir}/man1/lobase* %{_mandir}/man1/lobase*
%{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-base_72.svg %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-base_72.svg
%{ooodir}/share/xdg/base.desktop %{ooodir}/share/xdg/base.desktop
%{_datadir}/appdata/libreoffice-base.appdata.xml
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -316,6 +316,7 @@ This package contains the spreadsheet component for LibreOffice.
%{_mandir}/man1/localc* %{_mandir}/man1/localc*
%{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-calc_72.svg %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-calc_72.svg
%{ooodir}/share/xdg/calc.desktop %{ooodir}/share/xdg/calc.desktop
%{_datadir}/appdata/libreoffice-calc.appdata.xml
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -326,6 +327,10 @@ Group: Office
Requires: %{name}-style = %{EVRD} Requires: %{name}-style = %{EVRD}
# But force galaxy style because it was used by default # But force galaxy style because it was used by default
Requires: %{name}-style-galaxy = %{EVRD} Requires: %{name}-style-galaxy = %{EVRD}
# And oxygen too, it should be default for KDE 4
Requires: %{name}-style-oxygen = %{EVRD}
# And breeze too, it should be default for Plasma 5
Requires: %{name}-style-breeze = %{EVRD}
Suggests: %{name}-help-en_US = %{EVRD} Suggests: %{name}-help-en_US = %{EVRD}
# And then general requires for OOo follows # And then general requires for OOo follows
Requires: ghostscript Requires: ghostscript
@ -431,6 +436,7 @@ This package contains the drawing component for LibreOffice.
%{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-draw_72.svg %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-draw_72.svg
%{_mandir}/man1/lodraw* %{_mandir}/man1/lodraw*
%{ooodir}/share/xdg/draw.desktop %{ooodir}/share/xdg/draw.desktop
%{_datadir}/appdata/libreoffice-draw.appdata.xml
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -460,6 +466,7 @@ This package contains the presentation component for LibreOffice.
%{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-impress_72.svg %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-impress_72.svg
%{_mandir}/man1/loimpress* %{_mandir}/man1/loimpress*
%{ooodir}/share/xdg/impress.desktop %{ooodir}/share/xdg/impress.desktop
%{_datadir}/appdata/libreoffice-impress.appdata.xml
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -474,8 +481,7 @@ This package contains the KDE4 plugin for drawing LibreOffice widgets with
KDE4/Qt4.x and a KDEish File Picker when running under KDE4. KDE4/Qt4.x and a KDEish File Picker when running under KDE4.
%files kde4 -f file-lists/kde4_list.txt %files kde4 -f file-lists/kde4_list.txt
%{_libdir}/libreoffice/program/libkde4be1lo.so
%{_libdir}/libreoffice/program/libvclplug_kde4lo.so
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%package math %package math
@ -544,17 +550,19 @@ This package contains the Python bindings for the UNO library.
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%package style-crystal %package style-breeze
Summary: Crystal symbol style for LibreOffice Summary: Breeze symbol style for LibreOffice
Group: Office Group: Office
Requires: %{name}-common = %{EVRD} Requires: %{name}-common = %{EVRD}
Provides: %{name}-style = %{EVRD} Provides: %{name}-style = %{EVRD}
Obsoletes: %{name}-style-crystal < 1:5.1.1
%description style-crystal %description style-breeze
This package contains the "crystal" symbol style, default style for KDE. This package contains the "breeze" symbol style, needs to be manually
enabled in the LibreOffice option menu.
%files style-crystal %files style-breeze
%{ooodir}/share/config/images_crystal.zip %{ooodir}/share/config/images_breeze.zip
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -571,7 +579,7 @@ MS Windows (tm) and when not using GNOME or KDE. Needs to be manually enabled
in the LibreOffice option menu. in the LibreOffice option menu.
%files style-galaxy %files style-galaxy
%{_libdir}/libreoffice/share/config/images_galaxy.zip %{ooodir}/share/config/images_galaxy.zip
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -604,6 +612,22 @@ This package contains the "oxygen" symbol style, default style for KDE4.
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%package style-sifr
Summary: Sifr symbol style for LibreOffice
Group: Office
Requires: %{name}-common = %{EVRD}
Provides: %{name}-style = %{EVRD}
Conflicts: %{name}-common < 1:5.1.1
%description style-sifr
This package contains the "sifr" symbol style, needs to be manually
enabled in the LibreOffice option menu.
%files style-sifr
%{ooodir}/share/config/images_sifr.zip
#----------------------------------------------------------------------------
%package style-tango %package style-tango
Summary: Tango symbol style for LibreOffice Summary: Tango symbol style for LibreOffice
Group: Office Group: Office
@ -632,6 +656,7 @@ This package contains the word processor component for LibreOffice.
%{_mandir}/man1/loweb* %{_mandir}/man1/loweb*
%{_mandir}/man1/lowriter* %{_mandir}/man1/lowriter*
%{ooodir}/share/xdg/writer.desktop %{ooodir}/share/xdg/writer.desktop
%{_datadir}/appdata/libreoffice-writer.appdata.xml
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -3293,11 +3318,12 @@ touch autogen.lastrun
--enable-lockdown \ --enable-lockdown \
--enable-opengl \ --enable-opengl \
--disable-firebird-sdbc \ --disable-firebird-sdbc \
--disable-introspection \
--enable-eot \ --enable-eot \
--enable-odk \ --enable-odk \
--enable-split-app-modules \ --enable-split-app-modules \
--enable-split-opt-features \ --enable-split-opt-features \
--enable-telepathy \ --disable-telepathy \
--enable-extra-gallery \ --enable-extra-gallery \
--enable-extra-template \ --enable-extra-template \
--with-sun-templates \ --with-sun-templates \
@ -3414,7 +3440,7 @@ make -r -s V=0 \
ARCH_FLAGS_CC="$ARCH_FLAGS_CC" \ ARCH_FLAGS_CC="$ARCH_FLAGS_CC" \
ARCH_FLAGS_CXX="$ARCH_FLAGS_CXX" \ ARCH_FLAGS_CXX="$ARCH_FLAGS_CXX" \
ARCH_FLAGS_OPT="$ARCH_FLAGS_OPT" \ ARCH_FLAGS_OPT="$ARCH_FLAGS_OPT" \
build build-nocheck
echo "Make end at: "`date` >> ooobuildtime.log echo "Make end at: "`date` >> ooobuildtime.log
echo "Install start at: "`date` >> ooobuildtime.log echo "Install start at: "`date` >> ooobuildtime.log
@ -3500,7 +3526,7 @@ sort -u file-lists/sdk_list.txt > file-lists/sdk_list.uniq.sorted.txt
sed -i -e 's/\[/?/g;s/\]/?/g' file-lists/sdk*.txt sed -i -e 's/\[/?/g;s/\]/?/g' file-lists/sdk*.txt
## styles have their own packages ## styles have their own packages
for i in oxygen galaxy crystal hicontrast tango; do for i in oxygen galaxy breeze hicontrast tango sifr; do
sed -i "/^.*images_$i\.zip$/d" file-lists/common_list.txt sed -i "/^.*images_$i\.zip$/d" file-lists/common_list.txt
done done
# galaxy style too # galaxy style too