mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 10:32:59 +00:00
Updated to 5.4.0.3
This commit is contained in:
parent
e1c07d2991
commit
02c73d1b7a
9 changed files with 93 additions and 559 deletions
13
.abf.yml
13
.abf.yml
|
@ -4,7 +4,6 @@ sources:
|
|||
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: 7168b0f40aa5c72267899601c116d2348d2f56ec
|
||||
185d60944ea767075d27247c3162b3bc-unowinreg.dll: 0619ed3a89644bef318df67db12045b2b590585b
|
||||
1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip: 1dd5bd9962e851b5e487b0c2033b5a8951aaefad
|
||||
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz: 8f949ae74a6d66278a595bd063f13e0ad196d14a
|
||||
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt: 206a371b46a3d991722b059b5d6f3bb29f1fc48b
|
||||
23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt: da769c6f73206f0f0e6db4697f802c0bacbf4d02
|
||||
27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt: 6d400d83fa2080847ad9d7e2ca466a98ee2dbfa4
|
||||
|
@ -17,6 +16,7 @@ sources:
|
|||
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39
|
||||
53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca
|
||||
86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz: a0cc67aa534167bb59bcca0dc6a7db2573814542
|
||||
8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz: c78ddd06845e267ba5bec20a38430f66eec3e0e4
|
||||
8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt: ad53e6f0b18842ade578cad5acc9ea651ad01a03
|
||||
9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt: 0f0e7f1f1fd7951de2dd3b6bb7313c6adb4d17b8
|
||||
|
@ -31,9 +31,10 @@ sources:
|
|||
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c
|
||||
b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389
|
||||
bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt: c89331a8d7642429f4fe3ffe07ee6d675f99561a
|
||||
ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz: 40117ab0f788e43deef6eaf028c88f6abc3a30d0
|
||||
commons-logging-1.2-src.tar.gz: 0a134d01e9aeb09b33f4c7450fb41abb7bed9db6
|
||||
libreoffice-5.2.7.2.tar.xz: b34e13ba11681ab81627c778c6180ecb60f39a15
|
||||
libreoffice-dictionaries-5.2.7.2.tar.xz: 6d6af153fae2ffc5bacf2fa980bdb03ec6450a3a
|
||||
libreoffice-help-5.2.7.2.tar.xz: 2be339ef15042915812537c0bca3ae4088366342
|
||||
libreoffice-translations-5.2.7.2.tar.xz: d06f4ff1c4435cb41f42e8aaa38cea07c1f87d9d
|
||||
libreoffice-5.4.0.3.tar.xz: 46ed5a449c39b31927d2d12ccce02f311486e7ff
|
||||
libreoffice-dictionaries-5.4.0.3.tar.xz: 862e764e25953d3efd79757f018b007aa7eb63ad
|
||||
libreoffice-help-5.4.0.3.tar.xz: c972b0b43aef81e8e39dbf897efb5c8479dc2aac
|
||||
libreoffice-translations-5.4.0.3.tar.xz: 7811e8139ee6c40b2778d41992f692e6d5a6e52e
|
||||
pdfium-3064.tar.bz2: 70135df62d10db3471054bd29fb9bf48d8bc5b7c
|
||||
xmlsec1-1.2.24.tar.gz: b64a443641de3338d7d1ba17f25653a314d65d93
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
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)
|
|
@ -1,6 +1,6 @@
|
|||
diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/base.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/base.desktop
|
||||
--- libreoffice-5.2.1.2/sysui/desktop/menus/base.desktop 2016-08-25 10:26:36.000000000 +1000
|
||||
+++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/base.desktop 2016-09-06 12:12:33.181785178 +1000
|
||||
diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/base.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/base.desktop
|
||||
--- libreoffice-5.3.1.1/sysui/desktop/menus/base.desktop 2017-02-20 16:24:34.000000000 +0300
|
||||
+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/base.desktop 2017-03-12 14:41:46.552237494 +0300
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=base
|
||||
|
@ -10,9 +10,9 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/base.desktop libreoffice-5.2.1
|
|||
Exec=${UNIXBASISROOTNAME} --base %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
|
||||
Name=%PRODUCTNAME Base
|
||||
diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/calc.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/calc.desktop
|
||||
--- libreoffice-5.2.1.2/sysui/desktop/menus/calc.desktop 2016-08-25 10:26:36.000000000 +1000
|
||||
+++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/calc.desktop 2016-09-06 12:12:33.181785178 +1000
|
||||
diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/calc.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/calc.desktop
|
||||
--- libreoffice-5.3.1.1/sysui/desktop/menus/calc.desktop 2017-02-20 16:24:34.000000000 +0300
|
||||
+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/calc.desktop 2017-03-12 14:45:56.097234689 +0300
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=calc
|
||||
|
@ -20,11 +20,11 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/calc.desktop libreoffice-5.2.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;application/x-iwork-numbers-sffnumbers;
|
||||
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;application/x-starcalc;
|
||||
Name=%PRODUCTNAME Calc
|
||||
diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/draw.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/draw.desktop
|
||||
--- libreoffice-5.2.1.2/sysui/desktop/menus/draw.desktop 2016-08-25 10:26:36.000000000 +1000
|
||||
+++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/draw.desktop 2016-09-06 12:12:33.181785178 +1000
|
||||
diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/draw.desktop
|
||||
--- libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop 2017-02-20 16:24:34.000000000 +0300
|
||||
+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/draw.desktop 2017-03-12 14:45:42.671234840 +0300
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=draw
|
||||
|
@ -32,11 +32,11 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/draw.desktop libreoffice-5.2.1
|
|||
-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;application/x-pagemaker;application/pdf;
|
||||
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;application/pdf;application/x-stardraw;
|
||||
Name=%PRODUCTNAME Draw
|
||||
diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/impress.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/impress.desktop
|
||||
--- libreoffice-5.2.1.2/sysui/desktop/menus/impress.desktop 2016-08-25 10:26:36.000000000 +1000
|
||||
+++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/impress.desktop 2016-09-06 12:12:33.181785178 +1000
|
||||
diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/impress.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/impress.desktop
|
||||
--- libreoffice-5.3.1.1/sysui/desktop/menus/impress.desktop 2017-02-20 16:24:34.000000000 +0300
|
||||
+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/impress.desktop 2017-03-12 14:45:29.919234983 +0300
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=impress
|
||||
|
@ -46,21 +46,21 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/impress.desktop libreoffice-5.
|
|||
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-5.2.1.2/sysui/desktop/menus/math.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/math.desktop
|
||||
--- libreoffice-5.2.1.2/sysui/desktop/menus/math.desktop 2016-08-25 10:26:36.000000000 +1000
|
||||
+++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/math.desktop 2016-09-06 12:12:33.181785178 +1000
|
||||
diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/math.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/math.desktop
|
||||
--- libreoffice-5.3.1.1/sysui/desktop/menus/math.desktop 2017-02-20 16:24:34.000000000 +0300
|
||||
+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/math.desktop 2017-03-12 14:45:15.964235140 +0300
|
||||
@@ -21,7 +21,7 @@
|
||||
NoDisplay=false
|
||||
Icon=math
|
||||
Type=Application
|
||||
-Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
|
||||
+Categories=Science;Math;
|
||||
+Categories=Office;Spreadsheet;
|
||||
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-5.2.1.2/sysui/desktop/menus/startcenter.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/startcenter.desktop
|
||||
--- libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop 2016-08-25 10:26:36.000000000 +1000
|
||||
+++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/startcenter.desktop 2016-09-06 12:12:33.181785178 +1000
|
||||
diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/startcenter.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/startcenter.desktop
|
||||
--- libreoffice-5.3.1.1/sysui/desktop/menus/startcenter.desktop 2017-02-20 16:24:34.000000000 +0300
|
||||
+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/startcenter.desktop 2017-03-12 14:46:27.341234338 +0300
|
||||
@@ -21,7 +21,7 @@
|
||||
NoDisplay=false
|
||||
Icon=startcenter
|
||||
|
@ -70,9 +70,9 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop libreoffic
|
|||
Exec=${UNIXBASISROOTNAME} %%FILE%%
|
||||
MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis;
|
||||
Name=%PRODUCTNAME
|
||||
diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/writer.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/writer.desktop
|
||||
--- libreoffice-5.2.1.2/sysui/desktop/menus/writer.desktop 2016-08-25 10:26:36.000000000 +1000
|
||||
+++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/writer.desktop 2016-09-06 12:12:33.182785178 +1000
|
||||
diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/writer.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/writer.desktop
|
||||
--- libreoffice-5.3.1.1/sysui/desktop/menus/writer.desktop 2017-02-20 16:24:34.000000000 +0300
|
||||
+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/writer.desktop 2017-03-12 14:46:41.189234182 +0300
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=writer
|
||||
|
@ -80,5 +80,5 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/writer.desktop libreoffice-5.2
|
|||
-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;application/x-iwork-pages-sffpages;application/x-mswrite;
|
||||
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;application/x-starwriter;
|
||||
Name=%PRODUCTNAME Writer
|
|
@ -1,7 +1,7 @@
|
|||
diff -urN libreoffice-5.2.3.3/vcl/unx/generic/plugadapt/salplug.cxx libreoffice-5.2.3.3-patched/vcl/unx/generic/plugadapt/salplug.cxx
|
||||
--- libreoffice-5.2.3.3/vcl/unx/generic/plugadapt/salplug.cxx 2016-10-29 00:50:26.000000000 +1000
|
||||
+++ libreoffice-5.2.3.3-patched/vcl/unx/generic/plugadapt/salplug.cxx 2016-11-14 23:54:15.921687817 +1000
|
||||
@@ -68,6 +68,14 @@
|
||||
diff -urN libreoffice-5.3.1.1/vcl/unx/generic/plugadapt/salplug.cxx libreoffice-5.3.1.1-patched/vcl/unx/generic/plugadapt/salplug.cxx
|
||||
--- libreoffice-5.3.1.1/vcl/unx/generic/plugadapt/salplug.cxx 2017-02-20 16:24:34.000000000 +0300
|
||||
+++ libreoffice-5.3.1.1-patched/vcl/unx/generic/plugadapt/salplug.cxx 2017-03-12 15:00:38.042224777 +0300
|
||||
@@ -69,6 +69,14 @@
|
||||
return svp_create_SalInstance();
|
||||
|
||||
SalInstance* pInst = nullptr;
|
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
diff -urN libreoffice-5.4.0.1/dbaccess/Module_dbaccess.mk libreoffice-5.4.0.1-patched/dbaccess/Module_dbaccess.mk
|
||||
--- libreoffice-5.4.0.1/dbaccess/Module_dbaccess.mk 2017-06-22 13:47:10.000000000 +0300
|
||||
+++ libreoffice-5.4.0.1-patched/dbaccess/Module_dbaccess.mk 2017-07-07 20:15:08.269290040 +0300
|
||||
@@ -34,12 +34,6 @@
|
||||
UIConfig_dbtdata \
|
||||
))
|
16
libreoffice-5.4.0.1-disable-test-hsqldb.patch
Normal file
16
libreoffice-5.4.0.1-disable-test-hsqldb.patch
Normal file
|
@ -0,0 +1,16 @@
|
|||
diff -urN libreoffice-5.4.0.1/dbaccess/Module_dbaccess.mk libreoffice-5.4.0.1-patched/dbaccess/Module_dbaccess.mk
|
||||
--- libreoffice-5.4.0.1/dbaccess/Module_dbaccess.mk 2017-06-22 13:47:10.000000000 +0300
|
||||
+++ libreoffice-5.4.0.1-patched/dbaccess/Module_dbaccess.mk 2017-07-07 20:10:12.107270157 +0300
|
||||
@@ -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 performance tests on embedded firebird and HSQLDB.
|
||||
# Instructions on running the test can be found in qa/unit/embeddedb_performancetest
|
||||
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
|
|
@ -1,23 +1,7 @@
|
|||
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-5.1.1.3/i18nlangtag/qa/cppunit/test_languagetag.cxx 2016-03-01 09:20:43.000000000 +1000
|
||||
+++ libreoffice-5.1.1.3-patched/i18nlangtag/qa/cppunit/test_languagetag.cxx 2016-04-02 20:29:23.210480495 +1000
|
||||
@@ -506,6 +506,7 @@
|
||||
CPPUNIT_ASSERT( qtz.getLanguageType() == LANGUAGE_USER_KEYID );
|
||||
}
|
||||
|
||||
+#if 0
|
||||
// 'qty' is a local use unknown locale
|
||||
{
|
||||
OUString s_qty( "qty" );
|
||||
@@ -517,6 +518,7 @@
|
||||
CPPUNIT_ASSERT( aLocale.Variant.isEmpty() );
|
||||
CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( qty.getLanguageType()) );
|
||||
}
|
||||
+#endif
|
||||
|
||||
// 'x-comment' is a privateuse known "locale"
|
||||
{
|
||||
@@ -611,11 +613,11 @@
|
||||
diff -urN libreoffice-5.4.0.1/i18nlangtag/qa/cppunit/test_languagetag.cxx libreoffice-5.4.0.1-patched/i18nlangtag/qa/cppunit/test_languagetag.cxx
|
||||
--- libreoffice-5.4.0.1/i18nlangtag/qa/cppunit/test_languagetag.cxx 2017-06-22 13:47:10.000000000 +0300
|
||||
+++ libreoffice-5.4.0.1-patched/i18nlangtag/qa/cppunit/test_languagetag.cxx 2017-07-07 19:40:36.407150947 +0300
|
||||
@@ -619,11 +619,11 @@
|
||||
OUString aCanonicalized;
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized) && aCanonicalized == "en-US" );
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized) && aCanonicalized == "x-foobar" );
|
||||
|
@ -28,6 +12,6 @@ diff -urN libreoffice-5.1.1.3/i18nlangtag/qa/cppunit/test_languagetag.cxx libreo
|
|||
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 ENABLE_LIBLANGTAG
|
||||
CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-DE" );
|
||||
/* TODO: at least some (those we know) grandfathered tags should be
|
||||
* recognized by the replacement code. */
|
|
@ -1,7 +1,7 @@
|
|||
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 @@
|
||||
diff -urN libreoffice-5.4.0.1/vcl/unx/kde4/KDESalGraphics.cxx libreoffice-5.4.0.1-patched/vcl/unx/kde4/KDESalGraphics.cxx
|
||||
--- libreoffice-5.4.0.1/vcl/unx/kde4/KDESalGraphics.cxx 2017-06-22 13:47:10.000000000 +0300
|
||||
+++ libreoffice-5.4.0.1-patched/vcl/unx/kde4/KDESalGraphics.cxx 2017-07-07 20:59:40.651469448 +0300
|
||||
@@ -138,8 +138,13 @@
|
||||
option->state |= state;
|
||||
option->rect = image->rect();
|
||||
|
||||
|
@ -16,4 +16,4 @@ diff -urN libreoffice-4.4.1.2/vcl/unx/kde4/KDESalGraphics.cxx libreoffice-4.4.1.
|
|||
+ }
|
||||
}
|
||||
|
||||
void lcl_drawFrame(QStyle::PrimitiveElement element, QImage* image, QStyle::State state)
|
||||
void lcl_drawFrame( QStyle::PrimitiveElement element, QImage* image, QStyle::State const & state,
|
505
libreoffice.spec
505
libreoffice.spec
|
@ -23,9 +23,10 @@
|
|||
%define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/
|
||||
%define distroname ROSA
|
||||
%define ooname libreoffice
|
||||
%define buildver %{version}.2
|
||||
%define buildver %{version}.3
|
||||
%define ooodir %{_libdir}/libreoffice
|
||||
%define antpath %{_builddir}/libreoffice-%{version}/apache-ant-1.10.1
|
||||
%define antver 1.10.1
|
||||
%define antpath %{_builddir}/libreoffice-%{version}/apache-ant-%{antver}
|
||||
|
||||
%define ccachedir ~/.ccache-OOo
|
||||
|
||||
|
@ -40,8 +41,8 @@
|
|||
Summary: Office suite
|
||||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: 5.2.7
|
||||
Release: 1
|
||||
Version: 5.4.0
|
||||
Release: 3
|
||||
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
|
||||
|
@ -55,22 +56,20 @@ Source4: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-
|
|||
# Unused, should be dropped in future package updates
|
||||
Source10: Mandriva-Rosa_Icons.tar.bz2
|
||||
%if %{javaless}
|
||||
Source20: http://archive.apache.org/dist/ant/binaries/apache-ant-1.10.1-bin.tar.bz2
|
||||
Source20: http://archive.apache.org/dist/ant/binaries/apache-ant-%{antver}-bin.tar.bz2
|
||||
Source30: %{devurl}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
|
||||
Source31: %{devurl}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-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
|
||||
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
|
||||
|
||||
# Extensions
|
||||
Source48: %{srcurl}xmlsec1-1.2.24.tar.gz
|
||||
Source49: %{srcurl}pdfium-3064.tar.bz2
|
||||
Source50: %{srcurl}451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
|
||||
Source51: %{srcurl}b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
|
||||
Source52: %{oxyurl}3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt
|
||||
|
@ -92,26 +91,25 @@ Source67: %{oxyurl}b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0
|
|||
Source68: %{srcurl}4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
|
||||
Source69: %{srcurl}OpenCOLLADA-master-6509aa13af.tar.bz2
|
||||
Source70: %{srcurl}1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
|
||||
Source71: %{srcurl}ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
|
||||
Source71: %{srcurl}86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
|
||||
|
||||
Source1000: libreoffice.rpmlintrc
|
||||
|
||||
Patch0: libreoffice-5.1.1.3-disable-test-languagetag.patch
|
||||
Patch0: libreoffice-5.4.0.1-disable-test-languagetag.patch
|
||||
Patch1: libreoffice-4.2.5-icu-49.patch
|
||||
Patch2: libreoffice-5.1.1.3-disable-test-hsqldb.patch
|
||||
Patch3: libreoffice-5.1.1.3-disable-test-firebird.patch
|
||||
Patch2: libreoffice-5.4.0.1-disable-test-hsqldb.patch
|
||||
Patch3: libreoffice-5.4.0.1-disable-test-firebird.patch
|
||||
|
||||
Patch51: libreoffice-4.4.1.2-impress-kde-crash-hack.patch
|
||||
Patch51: libreoffice-5.4.0.1-impress-kde-crash-hack.patch
|
||||
|
||||
# ROSA vendor patch
|
||||
Patch100: libreoffice-4.1-vendor.patch
|
||||
Patch101: libreoffice-5.2.1.2-desktop-categories.patch
|
||||
Patch101: libreoffice-5.3.1.1-desktop-categories.patch
|
||||
Patch102: libreoffice-5.2.1.2-desktop-protocols.patch
|
||||
#Patch103: libreoffice-5.1.1.3-desktop-startcenter-nodisplay.patch
|
||||
Patch104: libreoffice-5.1.2.2-desktop-startcenter-nomate.patch
|
||||
# Disable gtk3 plugin unless explicitly requested via SAL_USE_VCLPLUGIN=gtk3
|
||||
# It's still very experimental and doesn't work properly
|
||||
Patch105: libreoffice-5.2.3.3-gtk3.patch
|
||||
Patch105: libreoffice-5.3.1.1-gtk3.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: bsh
|
||||
|
@ -121,7 +119,6 @@ BuildRequires: ccache
|
|||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: doxygen >= 1.8.4
|
||||
BuildRequires: ed
|
||||
#BuildRequires: firebird-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: flute
|
||||
BuildRequires: git
|
||||
|
@ -132,6 +129,8 @@ BuildRequires: icecream
|
|||
BuildRequires: icu
|
||||
BuildRequires: imagemagick
|
||||
BuildRequires: locales-en
|
||||
BuildRequires: pkgconfig(libstaroffice-0.0)
|
||||
BuildRequires: pkgconfig(libzmf-0.0)
|
||||
BuildRequires: pentaho-libxml
|
||||
BuildRequires: pentaho-reporting-flow-engine
|
||||
BuildRequires: perl-Archive-Zip
|
||||
|
@ -163,6 +162,7 @@ BuildRequires: qt4-devel
|
|||
BuildRequires: readline-devel
|
||||
BuildRequires: unixODBC-devel
|
||||
BuildRequires: vigra-devel
|
||||
BuildRequires: gpgmepp-devel
|
||||
BuildRequires: pkgconfig(bluez)
|
||||
BuildRequires: pkgconfig(cppunit)
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
|
@ -193,13 +193,13 @@ BuildRequires: pkgconfig(libcdr-0.1)
|
|||
BuildRequires: pkgconfig(libe-book-0.1)
|
||||
BuildRequires: pkgconfig(libeot)
|
||||
BuildRequires: pkgconfig(libexttextcat)
|
||||
BuildRequires: pkgconfig(libgltf-0.0)
|
||||
BuildRequires: pkgconfig(libgltf-0.1)
|
||||
BuildRequires: pkgconfig(libixion-0.12)
|
||||
BuildRequires: pkgconfig(liblangtag)
|
||||
BuildRequires: pkgconfig(libmspub-0.1)
|
||||
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.4
|
||||
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.0
|
||||
BuildRequires: pkgconfig(liborcus-0.11)
|
||||
BuildRequires: pkgconfig(liborcus-0.12)
|
||||
BuildRequires: pkgconfig(libpagemaker-0.0)
|
||||
BuildRequires: pkgconfig(libpq)
|
||||
BuildRequires: pkgconfig(librevenge-0.0)
|
||||
|
@ -231,6 +231,7 @@ BuildRequires: pkgconfig(redland)
|
|||
BuildRequires: pkgconfig(sane-backends)
|
||||
BuildRequires: pkgconfig(sndfile)
|
||||
BuildRequires: pkgconfig(xaw7)
|
||||
BuildRequires: pkgconfig(xmlsec1)
|
||||
BuildRequires: pkgconfig(xpm)
|
||||
BuildRequires: pkgconfig(xtst)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
|
@ -256,6 +257,7 @@ Requires: %{name}-math = %{EVRD}
|
|||
Requires: %{name}-writer = %{EVRD}
|
||||
Provides: LibreOffice = %{EVRD}
|
||||
Provides: LibreOffice-libs = %{EVRD}
|
||||
Obsoletes: libreoffice-style-oxygen < %{EVRD}
|
||||
|
||||
%description
|
||||
LibreOffice is an Open Source, community-developed, multi-platform
|
||||
|
@ -329,8 +331,6 @@ Group: Office
|
|||
Requires: %{name}-style = %{EVRD}
|
||||
# But force galaxy style because it was used by default
|
||||
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}
|
||||
|
@ -479,13 +479,13 @@ This package contains the presentation component for LibreOffice.
|
|||
Summary: KDE4 Integration for LibreOffice (Widgets, Dialogs, Addressbook)
|
||||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
Suggests: %{name}-style-oxygen = %{EVRD}
|
||||
|
||||
%description kde4
|
||||
This package contains the KDE4 plugin for drawing LibreOffice widgets with
|
||||
KDE4/Qt4.x and a KDEish File Picker when running under KDE4.
|
||||
|
||||
%files kde4 -f file-lists/kde4_list.txt
|
||||
%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
@ -514,9 +514,6 @@ This package contains the LibreOffice Open Clipart data, including images
|
|||
and sounds.
|
||||
|
||||
%files openclipart
|
||||
%{ooodir}/share/gallery/Draws
|
||||
%{ooodir}/share/gallery/Elements
|
||||
%{ooodir}/share/gallery/Photos
|
||||
%{ooodir}/share/gallery/apples*
|
||||
%{ooodir}/share/gallery/arrows*
|
||||
%{ooodir}/share/gallery/bigapple*
|
||||
|
@ -605,20 +602,6 @@ enabled in the LibreOffice option menu.
|
|||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package style-oxygen
|
||||
Summary: Oxygen symbol style for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
Provides: %{name}-style = %{EVRD}
|
||||
|
||||
%description style-oxygen
|
||||
This package contains the "oxygen" symbol style, default style for KDE4.
|
||||
|
||||
%files style-oxygen
|
||||
%{ooodir}/share/config/images_oxygen.zip
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package style-sifr
|
||||
Summary: Sifr symbol style for LibreOffice
|
||||
Group: Office
|
||||
|
@ -690,19 +673,6 @@ wiki pages.
|
|||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package extension-barcode
|
||||
Summary: LibreOffice extension for generating barcodes
|
||||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
|
||||
%description extension-barcode
|
||||
LibreOffice extension for generating barcodes.
|
||||
|
||||
%files extension-barcode
|
||||
%{ooodir}/share/extensions/Barcode
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package extension-converttexttonumber
|
||||
Summary: Text to number converter for LibreOffice
|
||||
Group: Office
|
||||
|
@ -723,32 +693,6 @@ and then will be counted as expected in formulas Calc.
|
|||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package extension-gdocs
|
||||
Summary: LibreOffice Import/Export filter for Google Docs
|
||||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
|
||||
%description extension-gdocs
|
||||
LibreOffice Import/Export filter for Google Docs.
|
||||
|
||||
%files extension-gdocs
|
||||
%{ooodir}/share/extensions/gdocs
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package extension-hunart
|
||||
Summary: Hungarian cross-reference toolbar extension for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
|
||||
%description extension-hunart
|
||||
Hungarian cross-reference toolbar extension for LibreOffice.
|
||||
|
||||
%files extension-hunart
|
||||
%{ooodir}/share/extensions/hunart
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package extension-languagetool
|
||||
Summary: A LibreOffice extension for style and grammar proofreading
|
||||
Group: Office
|
||||
|
@ -802,66 +746,6 @@ Number-to-Text conversion function for LibreOffice Calc.
|
|||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package extension-SmART
|
||||
Summary: Diagram generator for LibreOffice Draw and Impress
|
||||
Group: Office
|
||||
Url: http://extensions.libreoffice.org/extension-center/smart
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
Obsoletes: %{name}-extension-diagram < %{EVRD}
|
||||
|
||||
%description extension-SmART
|
||||
SmART Gallery extension is the advanced version of Diagram (aka. Diagram 2)
|
||||
for LibreOffice and OpenOffice.org office suites. This Extension is designed
|
||||
to create your favorite diagrams with few clicks in Draw and Impress
|
||||
applications.
|
||||
|
||||
%files extension-SmART
|
||||
%{ooodir}/share/extensions/SmART
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package extension-typo
|
||||
Summary: Typographic toolbar for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
|
||||
%description extension-typo
|
||||
Typographic toolbar for LibreOffice.
|
||||
|
||||
%files extension-typo
|
||||
%{ooodir}/share/extensions/typo
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package extension-validator
|
||||
Summary: A LibreOffice Calc extension that validates cells based on selected rules
|
||||
Group: Office
|
||||
Requires: %{name}-calc = %{EVRD}
|
||||
|
||||
%description extension-validator
|
||||
A LibreOffice Calc extension that validates cells based on selected rules.
|
||||
|
||||
%files extension-validator
|
||||
%{ooodir}/share/extensions/Validator
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package extension-watchwindow
|
||||
Summary: Macro debugging tool for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-common = %{EVRD}
|
||||
|
||||
%description extension-watchwindow
|
||||
The Watch window allows you to observe the value of variables during the
|
||||
execution of a program. Define the variable in the Watch text box.
|
||||
Click on Enable Watch to add the variable to the list box and to display
|
||||
its values.
|
||||
|
||||
%files extension-watchwindow
|
||||
%{ooodir}/share/extensions/WatchWindow
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package postgresql
|
||||
Summary: PostgreSQL connector for LibreOffice
|
||||
Group: Office
|
||||
|
@ -2985,338 +2869,6 @@ Traditional.
|
|||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package templates-common
|
||||
Summary: Files used by LibreOffice templates
|
||||
Group: Office
|
||||
|
||||
%description templates-common
|
||||
Files used by LibreOffice templates.
|
||||
|
||||
%files templates-common
|
||||
%{ooodir}/share/template/common/dummy_common_templates.txt
|
||||
%{ooodir}/share/template/common/educate
|
||||
%{ooodir}/share/template/common/finance
|
||||
%{ooodir}/share/template/common/forms
|
||||
%{ooodir}/share/template/common/labels
|
||||
%{ooodir}/share/template/common/layout/31407-squares.otp
|
||||
%{ooodir}/share/template/common/layout/Blue*.otp
|
||||
%{ooodir}/share/template/common/layout/Cool_Space.otp
|
||||
%{ooodir}/share/template/common/layout/Cubes.otp
|
||||
%{ooodir}/share/template/common/layout/Doppellinie-blau.otp
|
||||
%{ooodir}/share/template/common/layout/EarthLight.otp
|
||||
%{ooodir}/share/template/common/layout/Girasoles.otp
|
||||
%{ooodir}/share/template/common/layout/Glossy.otp
|
||||
%{ooodir}/share/template/common/layout/Green.otp
|
||||
%{ooodir}/share/template/common/layout/Grey.otp
|
||||
%{ooodir}/share/template/common/layout/Hatch.otp
|
||||
%{ooodir}/share/template/common/layout/Human.otp
|
||||
%{ooodir}/share/template/common/layout/Infantil.otp
|
||||
%{ooodir}/share/template/common/layout/Lamp.otp
|
||||
%{ooodir}/share/template/common/layout/Lay_grafity.otp
|
||||
%{ooodir}/share/template/common/layout/Lay_wood.otp
|
||||
%{ooodir}/share/template/common/layout/Marble.otp
|
||||
%{ooodir}/share/template/common/layout/MediaStyle.otp
|
||||
%{ooodir}/share/template/common/layout/Mondo*.otp
|
||||
%{ooodir}/share/template/common/layout/Movie.otp
|
||||
%{ooodir}/share/template/common/layout/NavyBlue.otp
|
||||
%{ooodir}/share/template/common/layout/Notepad.otp
|
||||
%{ooodir}/share/template/common/layout/Openblue.otp
|
||||
%{ooodir}/share/template/common/layout/Orange.otp
|
||||
%{ooodir}/share/template/common/layout/PhotoFrame.otp
|
||||
%{ooodir}/share/template/common/layout/Plantillafiesta.otp
|
||||
%{ooodir}/share/template/common/layout/Praesentation_Radial_*.otp
|
||||
%{ooodir}/share/template/common/layout/Quadratisch*.otp
|
||||
%{ooodir}/share/template/common/layout/RedStar.otp
|
||||
%{ooodir}/share/template/common/layout/Sidepanel_*.otp
|
||||
%{ooodir}/share/template/common/layout/Solar.otp
|
||||
%{ooodir}/share/template/common/layout/Soleil.otp
|
||||
%{ooodir}/share/template/common/layout/Sunburst.otp
|
||||
%{ooodir}/share/template/common/layout/Worldwide*.otp
|
||||
%{ooodir}/share/template/common/layout/abstract*.otp
|
||||
%{ooodir}/share/template/common/layout/aquarius.otp
|
||||
%{ooodir}/share/template/common/layout/blau.otp
|
||||
%{ooodir}/share/template/common/layout/blue-elegance.otp
|
||||
%{ooodir}/share/template/common/layout/blue.otp
|
||||
%{ooodir}/share/template/common/layout/carton.otp
|
||||
%{ooodir}/share/template/common/layout/chalkboard*.otp
|
||||
%{ooodir}/share/template/common/layout/circulos_*.otp
|
||||
%{ooodir}/share/template/common/layout/citrus-e.otp
|
||||
%{ooodir}/share/template/common/layout/compladients.otp
|
||||
%{ooodir}/share/template/common/layout/cross_*.otp
|
||||
%{ooodir}/share/template/common/layout/edge-*.otp
|
||||
%{ooodir}/share/template/common/layout/education-*.otp
|
||||
%{ooodir}/share/template/common/layout/emotion.otp
|
||||
%{ooodir}/share/template/common/layout/emotion2.otp
|
||||
%{ooodir}/share/template/common/layout/eos.otp
|
||||
%{ooodir}/share/template/common/layout/exec-??.otp
|
||||
%{ooodir}/share/template/common/layout/fields-of-peace.otp
|
||||
%{ooodir}/share/template/common/layout/fresh-morning.otp
|
||||
%{ooodir}/share/template/common/layout/glowing-rectangles.otp
|
||||
%{ooodir}/share/template/common/layout/golthia.otp
|
||||
%{ooodir}/share/template/common/layout/green-concentration.otp
|
||||
%{ooodir}/share/template/common/layout/greenish-wallpaper.otp
|
||||
%{ooodir}/share/template/common/layout/holiday-*.otp
|
||||
%{ooodir}/share/template/common/layout/humanist_presentation.otp
|
||||
%{ooodir}/share/template/common/layout/inspire-*.otp
|
||||
%{ooodir}/share/template/common/layout/kde.otp
|
||||
%{ooodir}/share/template/common/layout/keynote.otp
|
||||
%{ooodir}/share/template/common/layout/letterpress.otp
|
||||
%{ooodir}/share/template/common/layout/line_*.otp
|
||||
%{ooodir}/share/template/common/layout/list.txt
|
||||
%{ooodir}/share/template/common/layout/macos103.otp
|
||||
%{ooodir}/share/template/common/layout/moebius-strip.otp
|
||||
%{ooodir}/share/template/common/layout/more-green.otp
|
||||
%{ooodir}/share/template/common/layout/ooo2.otp
|
||||
%{ooodir}/share/template/common/layout/ooo2_spot.otp
|
||||
%{ooodir}/share/template/common/layout/openoffice.org_gulls.otp
|
||||
%{ooodir}/share/template/common/layout/perspective-*.otp
|
||||
%{ooodir}/share/template/common/layout/reo-veo*.otp
|
||||
%{ooodir}/share/template/common/layout/schatten_*.otp
|
||||
%{ooodir}/share/template/common/layout/science-*.otp
|
||||
%{ooodir}/share/template/common/layout/sedi.otp
|
||||
%{ooodir}/share/template/common/layout/standard-*.otp
|
||||
%{ooodir}/share/template/common/layout/sun.otp
|
||||
%{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/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
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-cs
|
||||
Summary: Czech templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-cs
|
||||
Czech templates for LibreOffice.
|
||||
|
||||
%files templates-cs
|
||||
%{ooodir}/share/template/cs
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-de
|
||||
Summary: German templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-de
|
||||
German templates for LibreOffice.
|
||||
|
||||
%files templates-de
|
||||
%{ooodir}/share/template/de
|
||||
%{ooodir}/share/extensions/Sun_ODF_Template_Pack_de
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-en_US
|
||||
Summary: US English templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-en_US
|
||||
US English templates for LibreOffice.
|
||||
|
||||
%files templates-en_US
|
||||
%{ooodir}/share/template/en-US
|
||||
%{ooodir}/share/extensions/Sun_ODF_Template_Pack_en-US
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-es
|
||||
Summary: Spanish templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-es
|
||||
Spanish templates for LibreOffice.
|
||||
|
||||
%files templates-es
|
||||
%{ooodir}/share/template/es
|
||||
%{ooodir}/share/extensions/Sun_ODF_Template_Pack_es
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-fi
|
||||
Summary: Finnish templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-fi
|
||||
Finnish templates for LibreOffice.
|
||||
|
||||
%files templates-fi
|
||||
%{ooodir}/share/template/fi
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-fr
|
||||
Summary: French templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-fr
|
||||
French templates for LibreOffice.
|
||||
|
||||
%files templates-fr
|
||||
%{ooodir}/share/template/fr
|
||||
%{ooodir}/share/extensions/Sun_ODF_Template_Pack_fr
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-hu
|
||||
Summary: Hungarian templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-hu
|
||||
Hungarian templates for LibreOffice.
|
||||
|
||||
%files templates-hu
|
||||
%{ooodir}/share/template/hu
|
||||
%{ooodir}/share/extensions/Sun_ODF_Template_Pack_hu
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-it
|
||||
Summary: Italian templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-it
|
||||
Italian templates for LibreOffice.
|
||||
|
||||
%files templates-it
|
||||
%{ooodir}/share/template/it
|
||||
%{ooodir}/share/extensions/Sun_ODF_Template_Pack_it
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-ja
|
||||
Summary: Japanese templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-ja
|
||||
Japanese templates for LibreOffice.
|
||||
|
||||
%files templates-ja
|
||||
%{ooodir}/share/template/ja
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-nl
|
||||
Summary: Dutch templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-nl
|
||||
Dutch templates for LibreOffice.
|
||||
|
||||
%files templates-nl
|
||||
%{ooodir}/share/template/nl
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-pl
|
||||
Summary: Polish templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-pl
|
||||
Polish templates for LibreOffice.
|
||||
|
||||
%files templates-pl
|
||||
%{ooodir}/share/template/pl
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-pt_BR
|
||||
Summary: Brazilian Portuguese templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-pt_BR
|
||||
Brazilian Portuguese templates for LibreOffice.
|
||||
|
||||
%files templates-pt_BR
|
||||
%{ooodir}/share/template/pt-BR
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-sv
|
||||
Summary: Swedish templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-sv
|
||||
Swedish templates for LibreOffice.
|
||||
|
||||
%files templates-sv
|
||||
%{ooodir}/share/template/sv
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-tr
|
||||
Summary: Turkish templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-tr
|
||||
Turkish templates for LibreOffice.
|
||||
|
||||
%files templates-tr
|
||||
%{ooodir}/share/template/tr
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%if %{with l10n}
|
||||
%package templates-zh_CN
|
||||
Summary: Simplified Chinese templates for LibreOffice
|
||||
Group: Office
|
||||
Requires: %{name}-templates-common = %{EVRD}
|
||||
|
||||
%description templates-zh_CN
|
||||
Simplified Chinese templates for LibreOffice.
|
||||
|
||||
%files templates-zh_CN
|
||||
%{ooodir}/share/template/zh-CN
|
||||
%endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -c -a 1 -a 2 -a 3
|
||||
rm -rf git-hooks */git-hooks
|
||||
|
@ -3385,7 +2937,7 @@ touch autogen.lastrun
|
|||
%configure2_5x \
|
||||
%{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \
|
||||
--with-vendor=ROSA \
|
||||
--with-build-version="ROSA %{version}-%{release}" \
|
||||
--with-build-version="ROSA %{buildver}-%{release}" \
|
||||
--disable-coinmp \
|
||||
--disable-fetch-external \
|
||||
--enable-gstreamer-1.0 \
|
||||
|
@ -3478,12 +3030,12 @@ ln -sf %{SOURCE321} external/tarballs/
|
|||
%endif
|
||||
|
||||
ln -sf %{SOURCE33} external/tarballs/
|
||||
ln -sf %{SOURCE34} external/tarballs/
|
||||
ln -sf %{SOURCE35} external/tarballs/
|
||||
ln -sf %{SOURCE36} external/tarballs/
|
||||
ln -sf %{SOURCE37} external/tarballs/
|
||||
|
||||
#ln -sf %{SOURCE40} external/tarballs/
|
||||
cp %{SOURCE48} external/tarballs/
|
||||
cp %{SOURCE49} external/tarballs/
|
||||
|
||||
ln -sf %{SOURCE50} external/tarballs/
|
||||
ln -sf %{SOURCE51} external/tarballs/
|
||||
|
@ -3543,9 +3095,6 @@ sed -i 's/^Icon=.*$/Icon=libreoffice-base/' %{buildroot}%{ooodir}/sha
|
|||
sed -i 's/^Icon=.*$/Icon=libreoffice-math/' %{buildroot}%{ooodir}/share/xdg/math.desktop
|
||||
sed -i 's/^Icon=.*$/Icon=libreoffice-startcenter/' %{buildroot}%{ooodir}/share/xdg/startcenter.desktop
|
||||
|
||||
# some genius committed commit log files...
|
||||
rm %{buildroot}%{ooodir}/share/template/common/svn-commit*.tmp
|
||||
|
||||
# fix permissions for stripping
|
||||
find %{buildroot} -type f -exec chmod u+rw '{}' \;
|
||||
|
||||
|
@ -3601,7 +3150,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
|
||||
|
||||
## styles have their own packages
|
||||
for i in oxygen galaxy breeze hicontrast tango sifr; do
|
||||
for i in galaxy breeze hicontrast tango sifr; do
|
||||
sed -i "/^.*images_$i\.zip$/d" file-lists/common_list.txt
|
||||
done
|
||||
# galaxy style too
|
||||
|
|
Loading…
Add table
Reference in a new issue