From 3c440fa3a13257c01fb6da114de8a34360686ba9d2c8e8a24c262d4c5a34420d Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 30 Jul 2013 16:39:30 +0000 Subject: [PATCH] - update to 4.1.0.4 with very big help from tchvatal@suse.com OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=45 --- ...d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 | 3 + ...0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz | 3 - ...19a7066f96733e-commons-lang-2.3-src.tar.gz | 3 - ...5ce7d69ddfff7-commons-codec-1.6-src.tar.gz | 3 + ...d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz | 3 + ...1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 | 3 + ...ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 | 3 + ...b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz | 3 + ...69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 | 3 - ...ca43c9469d6e6b-commons-lang-2.4-src.tar.gz | 3 + ...9d0239d654983028c9c7053-icu4c-51_1-src.tgz | 3 + ...5bf064f3e41f41-icu-51-layout-fix-10107.tgz | 3 + ...7343f4060c0eb83842daf-icu4c-49_1_1-src.tgz | 3 - ...3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 | 3 + ...94a9028569374dc87b2-liborcus_0.3.0.tar.bz2 | 3 - ...d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 | 3 - ...b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 | 3 - ...5fcdc92b492e1-commons-codec-1.3-src.tar.gz | 3 - ...6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz | 3 + ...ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 | 3 + boost-1.53-part1.patch | 31 ---- boost-1.53-part2.patch | 174 ------------------ bridges-missing-cxxflags.diff | 11 -- build-max-64-jobs.diff | 17 -- build_prepare.inc | 12 +- buildfix-sdext-poppler-0.23.0.diff | 18 +- buildfix-sfx2-dependency.diff | 10 - ...9dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 | 3 + ...ab8bb817185a116db809b-redland-1.0.8.tar.gz | 3 - ...69a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 | 3 - ...0a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 | 3 + ...c2cbcf7a021b34b9f88478-icudt49l-subset.zip | 3 - ...619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz | 3 - fix-collision.patch | 43 +++++ install-with-hardlinks.diff | 25 ++- libmwaw-0.1.10.tar.bz2 | 3 + libreoffice-4.0.3.3.5.tar.xz | 3 - libreoffice-4.1.0.4.tar.xz | 3 + libreoffice-branding-upstream.changes | 5 + libreoffice-branding-upstream.spec | 2 +- libreoffice-help-4.0.3.3.5.tar.xz | 3 - libreoffice-help-4.1.0.4.tar.xz | 3 + libreoffice-help-en-US.changes | 14 ++ libreoffice-help-en-US.spec | 44 ++--- libreoffice-help-en-US.spec.in | 46 +++-- libreoffice-help-group1.changes | 14 ++ libreoffice-help-group1.spec | 55 +++--- libreoffice-help-group2.changes | 14 ++ libreoffice-help-group2.spec | 55 +++--- libreoffice-help-group3.changes | 14 ++ libreoffice-help-group3.spec | 55 +++--- libreoffice-help-group4.changes | 14 ++ libreoffice-help-group4.spec | 55 +++--- libreoffice-help-group5.changes | 14 ++ libreoffice-help-group5.spec | 55 +++--- libreoffice-help-groupX.spec.in | 57 +++--- libreoffice-icon-themes.changes | 5 + libreoffice-icon-themes.spec | 2 +- libreoffice-l10n.changes | 5 + libreoffice-l10n.spec | 2 +- libreoffice-l10n.spec.in | 2 +- libreoffice-translations-4.0.3.3.5.tar.xz | 3 - libreoffice-translations-4.1.0.4.tar.xz | 3 + libreoffice.changes | 147 +++++++++++++++ libreoffice.spec | 114 +++++------- libvisio-0.0.27.tar.bz2 | 3 - libvisio-0.0.30.tar.bz2 | 3 + lo-provides-11.1 | 8 - lo-provides-12.1 | 3 - lo-requires-11.1 | 8 - lo-requires-12.1 | 3 - office-cfg-linux-common-template-dir.diff | 27 +-- officecfg-help-in-usr-share.diff | 38 ++-- redland-rpath-hack.diff | 11 -- solenv-carefull-patching-hack.diff | 25 --- split-help-buildhack-no-vcl.diff | 16 +- split-icons-search-usr-share.diff | 108 ++++------- system-poppler-0.12.3.diff | 18 +- 78 files changed, 692 insertions(+), 809 deletions(-) create mode 100644 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 delete mode 100644 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz delete mode 100644 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz create mode 100644 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz create mode 100644 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz create mode 100644 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 create mode 100644 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 create mode 100644 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz delete mode 100644 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 create mode 100644 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz create mode 100644 6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz create mode 100644 7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz delete mode 100644 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz create mode 100644 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 delete mode 100644 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 delete mode 100644 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 delete mode 100644 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 delete mode 100644 af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz create mode 100644 b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz create mode 100644 b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 delete mode 100644 boost-1.53-part1.patch delete mode 100644 boost-1.53-part2.patch delete mode 100644 bridges-missing-cxxflags.diff delete mode 100644 build-max-64-jobs.diff delete mode 100644 buildfix-sfx2-dependency.diff create mode 100644 c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 delete mode 100644 ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz delete mode 100644 d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 create mode 100644 ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 delete mode 100644 fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip delete mode 100644 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz create mode 100644 fix-collision.patch create mode 100644 libmwaw-0.1.10.tar.bz2 delete mode 100644 libreoffice-4.0.3.3.5.tar.xz create mode 100644 libreoffice-4.1.0.4.tar.xz delete mode 100644 libreoffice-help-4.0.3.3.5.tar.xz create mode 100644 libreoffice-help-4.1.0.4.tar.xz delete mode 100644 libreoffice-translations-4.0.3.3.5.tar.xz create mode 100644 libreoffice-translations-4.1.0.4.tar.xz delete mode 100644 libvisio-0.0.27.tar.bz2 create mode 100644 libvisio-0.0.30.tar.bz2 delete mode 100644 lo-provides-11.1 delete mode 100644 lo-provides-12.1 delete mode 100644 lo-requires-11.1 delete mode 100644 lo-requires-12.1 delete mode 100644 redland-rpath-hack.diff delete mode 100644 solenv-carefull-patching-hack.diff diff --git a/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 b/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 new file mode 100644 index 0000000..281b9cb --- /dev/null +++ b/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f605da2300c826b6f7c987fd36efb5f711bfa5c3e701ae9b75cea33591ce888b +size 138431 diff --git a/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz b/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz deleted file mode 100644 index 8e6f7ac..0000000 --- a/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edfdb0734fb7120bf1cbb60e45a07864db2daaadf5c3591ccf7357f244d82a40 -size 1657246 diff --git a/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz b/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz deleted file mode 100644 index bf0aaeb..0000000 --- a/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9775f8db678e15e9a482bbbf00b35c38da8bfc51c6dafa4531c6dd16225602fd -size 474681 diff --git a/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz b/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz new file mode 100644 index 0000000..7a52ac3 --- /dev/null +++ b/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae7bc26118cf1b58d8bed62ed364612d5a2380ad14acb03ca88ff3bab22b2e8b +size 262206 diff --git a/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz b/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz new file mode 100644 index 0000000..57627b9 --- /dev/null +++ b/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd +size 1624112 diff --git a/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 b/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 new file mode 100644 index 0000000..c30c2ef --- /dev/null +++ b/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3dd456762cd0b5fd1687f066c4bdf253d70b14729851b9cd05936a1cb46923b +size 651785 diff --git a/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 b/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 new file mode 100644 index 0000000..883b5c6 --- /dev/null +++ b/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffd5180b62a1c43039e3e2db00af84b2efb5cc36904a771e545d7d324e8a84d9 +size 474208 diff --git a/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz b/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz new file mode 100644 index 0000000..96e8349 --- /dev/null +++ b/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef +size 1788163 diff --git a/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 b/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 deleted file mode 100644 index 268cce2..0000000 --- a/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbb71d5d1af345c3bd9ceebbc78ddfbe70e3747c3cf95532a4fdef2abb034bae -size 613182 diff --git a/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz b/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz new file mode 100644 index 0000000..39de5ce --- /dev/null +++ b/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2445238cd0eb167e99a1147394f61325490559f3df7e7e8f628043fb70cbf2f4 +size 522654 diff --git a/6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz b/6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz new file mode 100644 index 0000000..1749c23 --- /dev/null +++ b/6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87e5ae513bd29f25f8648044af01d5ab77460912f375f9fe11f58a54e783666b +size 21815174 diff --git a/7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz b/7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz new file mode 100644 index 0000000..5f2dace --- /dev/null +++ b/7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:186c78baa946ca337c98081bacd91ffbd526433fc2c68b416cc95b0c10bb603f +size 209004 diff --git a/7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz b/7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz deleted file mode 100644 index 9c861a0..0000000 --- a/7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6f079e9bd92d9eddc3fcdeb943408c4bfd3d25a569a7060c9221f174403cdf1 -size 19001722 diff --git a/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 b/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 new file mode 100644 index 0000000..1a398e0 --- /dev/null +++ b/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:088940696f15fd8962bded2be7a996f1f005779936d6f0ac74793799f1c921f8 +size 334207 diff --git a/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 b/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 deleted file mode 100644 index 98e1a1f..0000000 --- a/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30829484b2328d0666c859b32370d3826b3468f3945d054abdac8234f4083c77 -size 1373518 diff --git a/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 b/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 deleted file mode 100644 index 3da1f95..0000000 --- a/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0bc8854af5affbcf6f91731d867163b96c4991220f8e3b28b9d49ca3cfba169 -size 335521 diff --git a/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 b/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 deleted file mode 100644 index 524ab36..0000000 --- a/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4381b38db6ee807090c6f352d62575ea8ce9768701ad95f01afbcda497e69960 -size 128115 diff --git a/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz b/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz deleted file mode 100644 index 24545c4..0000000 --- a/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12effcf3fea025bd34edbfec60a6216ca453fb27e781d8e5783caf75fd33d90e -size 80427 diff --git a/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz b/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz new file mode 100644 index 0000000..0a2e22a --- /dev/null +++ b/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd +size 1469921 diff --git a/b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 b/b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 new file mode 100644 index 0000000..5afbcf1 --- /dev/null +++ b/b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccb8907bdd78e2a094204a745431d6bcfdba475354ed3caba36aaea6c9d88626 +size 376802 diff --git a/boost-1.53-part1.patch b/boost-1.53-part1.patch deleted file mode 100644 index fa2e4e6..0000000 --- a/boost-1.53-part1.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f2814ac645f0e35d51c1cfc48fb84dbf68f8b4dc Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Sat, 16 Feb 2013 21:39:13 +0000 -Subject: Work around problem with boost::shared_array(NULL) ctor and Boost 1.53.0 - -...claiming - - template boost::shared_array::shared_array(Y*) - -is not a viable option due to mismatched types 'Y*' and 'long int' - -Change-Id: I8db321cd25cd73c84fa2a3124c9ec1018c131d5f -(cherry picked from commit b62048701cea5024383e19314592f2edcd9810fd) - -Signed-off-by: Markus Mohrhard ---- -diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx -index f98abcd..4d15ec3 100644 ---- a/vcl/source/gdi/svgdata.cxx -+++ b/vcl/source/gdi/svgdata.cxx -@@ -166,7 +166,7 @@ SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLeng - - ////////////////////////////////////////////////////////////////////////////// - SvgData::SvgData(const OUString& rPath): -- maSvgDataArray(NULL), -+ maSvgDataArray(), - mnSvgDataArrayLength(0), - maPath(rPath), - maRange(), --- -cgit v0.9.0.2-2-gbebe diff --git a/boost-1.53-part2.patch b/boost-1.53-part2.patch deleted file mode 100644 index 2a2cc6a..0000000 --- a/boost-1.53-part2.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 50f7c2a785aeff17488f09a1fd2ca5bae9d6c761 Mon Sep 17 00:00:00 2001 -From: Mark Wright -Date: Sat, 09 Feb 2013 15:04:02 +0000 -Subject: fix compile for change to boost 1.53.0 declaring smart pointer operator bool as explicity for C++11 compilers - -Change-Id: If2c3ad68b2ffea645a9f2035cd802553edc0ee79 -Reviewed-on: https://gerrit.libreoffice.org/2064 -Tested-by: LibreOffice gerrit bot -Reviewed-by: Norbert Thiebaud -(cherry picked from commit d4bab97023e3569571a92551040574b20aceca7c) - -Signed-off-by: Markus Mohrhard ---- -diff --git a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx -index 9b4fe1b..6c34074 100644 ---- a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx -+++ b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx -@@ -78,7 +78,7 @@ public: - - operator bool () const - { -- return m_aItem; -+ return static_cast< bool >(m_aItem); - } - - virtual ~scoped_disposing_ptr() -diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx -index bc0bcc7..d709a65 100644 ---- a/sc/source/filter/excel/xechart.cxx -+++ b/sc/source/filter/excel/xechart.cxx -@@ -682,7 +682,7 @@ void XclExpChEscherFormat::Convert( const ScfPropertySet& rPropSet, XclChObjectT - - bool XclExpChEscherFormat::IsValid() const - { -- return maData.mxEscherSet; -+ return static_cast< bool >(maData.mxEscherSet); - } - - void XclExpChEscherFormat::Save( XclExpStream& rStrm ) -diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx -index c493560..81e9ac2 100644 ---- a/sc/source/filter/excel/xehelper.cxx -+++ b/sc/source/filter/excel/xehelper.cxx -@@ -303,7 +303,7 @@ rtl::OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlFie - if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7 - { - // there was/is already a HLINK record -- mbMultipleUrls = mxLinkRec; -+ mbMultipleUrls = static_cast< bool >(mxLinkRec); - - mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) ); - -diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx -index f945a89..2b8462a 100644 ---- a/sc/source/filter/excel/xichart.cxx -+++ b/sc/source/filter/excel/xichart.cxx -@@ -2689,7 +2689,7 @@ void XclImpChTypeGroup::Finalize() - maType.Finalize( bStockChart ); - - // extended type info -- maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false ); -+ maTypeInfo.Set( maType.GetTypeInfo(), static_cast< bool >(mxChart3d), false ); - - // reverse series order for some unstacked 2D chart types - if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() ) -diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx -index 57538f0..7c44412 100644 ---- a/sc/source/filter/inc/xichart.hxx -+++ b/sc/source/filter/inc/xichart.hxx -@@ -1230,9 +1230,9 @@ public: - /** Returns true, if the axis contains caption labels. */ - inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); } - /** Returns true, if the axis shows its major grid lines. */ -- inline bool HasMajorGrid() const { return mxMajorGrid; } -+ inline bool HasMajorGrid() const { return static_cast< bool >(mxMajorGrid); } - /** Returns true, if the axis shows its minor grid lines. */ -- inline bool HasMinorGrid() const { return mxMinorGrid; } -+ inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); } - - /** Creates an API axis object. */ - XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const; -diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx -index e63d600..5d421c2 100644 ---- a/slideshow/source/engine/animatedsprite.cxx -+++ b/slideshow/source/engine/animatedsprite.cxx -@@ -151,7 +151,7 @@ namespace slideshow - } - } - -- return mpSprite; -+ return static_cast< bool >(mpSprite); - } - - void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ) -diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx -index 20c73de..621535f 100644 ---- a/slideshow/source/engine/shapes/viewshape.cxx -+++ b/slideshow/source/engine/shapes/viewshape.cxx -@@ -178,7 +178,7 @@ namespace slideshow - } - } - -- return io_rCacheEntry.mpRenderer; -+ return static_cast< bool >(io_rCacheEntry.mpRenderer); - } - - bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, -diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx -index c5636cc..da28159 100644 ---- a/slideshow/source/engine/shapesubset.cxx -+++ b/slideshow/source/engine/shapesubset.cxx -@@ -104,7 +104,7 @@ namespace slideshow - maTreeNode ); - } - -- return mpSubsetShape; -+ return static_cast< bool >(mpSubsetShape); - } - - void ShapeSubset::disableSubsetShape() -diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx -index 5f5e9f5..7d4c788 100644 ---- a/slideshow/source/engine/slide/slideanimations.cxx -+++ b/slideshow/source/engine/slide/slideanimations.cxx -@@ -74,7 +74,7 @@ namespace slideshow - - SHOW_NODE_TREE( mpRootNode ); - -- return mpRootNode; -+ return static_cast< bool >(mpRootNode); - } - - bool SlideAnimations::isAnimated() const -diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx -index 88405f8..d725255 100644 ---- a/slideshow/source/inc/shapeattributelayer.hxx -+++ b/slideshow/source/inc/shapeattributelayer.hxx -@@ -467,7 +467,7 @@ namespace slideshow - // ShapeAttributeLayer(const ShapeAttributeLayer&); - // ShapeAttributeLayer& operator=( const ShapeAttributeLayer& ); - -- bool haveChild() const { return mpChild; } -+ bool haveChild() const { return static_cast< bool >(mpChild); } - void updateStateIds(); - - template< typename T > T calcValue( const T& rCurrValue, -diff --git a/slideshow/source/inc/shapeattributelayerholder.hxx b/slideshow/source/inc/shapeattributelayerholder.hxx -index e53be46..22ce4f3 100644 ---- a/slideshow/source/inc/shapeattributelayerholder.hxx -+++ b/slideshow/source/inc/shapeattributelayerholder.hxx -@@ -83,7 +83,7 @@ namespace slideshow - if( mpShape ) - mpAttributeLayer = mpShape->createAttributeLayer(); - -- return mpAttributeLayer; -+ return static_cast< bool >(mpAttributeLayer); - } - - ShapeAttributeLayerSharedPtr get() const -diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx -index d4959b2..54dc972 100644 ---- a/sw/source/core/inc/bookmrk.hxx -+++ b/sw/source/core/inc/bookmrk.hxx -@@ -75,7 +75,7 @@ namespace sw { - - virtual bool IsCoveringPosition(const SwPosition& rPos) const; - virtual bool IsExpanded() const -- { return m_pPos2; } -+ { return static_cast< bool >(m_pPos2); } - - virtual void SetName(const ::rtl::OUString& rName) - { m_aName = rName; } --- -cgit v0.9.0.2-2-gbebe diff --git a/bridges-missing-cxxflags.diff b/bridges-missing-cxxflags.diff deleted file mode 100644 index 1341b2f..0000000 --- a/bridges-missing-cxxflags.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- bridges/Library_gcc3_linux_intel.mk.old 2012-12-18 16:11:42.000000000 +0100 -+++ bridges/Library_gcc3_linux_intel.mk 2013-01-04 18:14:38.000000000 +0100 -@@ -69,7 +69,7 @@ $(eval $(call gb_Library_add_exception_o - - $(eval $(call gb_Library_add_cxxobjects,gcc3_uno,\ - bridges/source/cpp_uno/shared/cppinterfaceproxy \ -- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -+ , $(CXXFLAGS) $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ - )) - - # vim: set noet sw=4 ts=4: diff --git a/build-max-64-jobs.diff b/build-max-64-jobs.diff deleted file mode 100644 index f7b6ed0..0000000 --- a/build-max-64-jobs.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -11999,6 +11999,12 @@ if test "$no_parallelism_make" = "YES" & - fi - fi - -+if test $PARALLELISM -gt 64 ; then -+ AC_MSG_WARN([dmake does not work with more than 64 jobs, reducing parallelism to 64.]) -+ add_warning "dmake does not work with more than 64 jobs, reducing parallelism to 64." -+ PARALLELISM="64" -+fi -+ - AC_MSG_RESULT([$PARALLELISM]) - AC_SUBST(PARALLELISM) - diff --git a/build_prepare.inc b/build_prepare.inc index 19fcf4d..6c8d263 100644 --- a/build_prepare.inc +++ b/build_prepare.inc @@ -31,7 +31,7 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then if test `uname -i` = "x86_64" ; then mem_per_process=1000 else - mem_per_process=600 + mem_per_process=800 fi %if 0%{?qemu_user_space_build:1} mem_per_process=1200 @@ -56,9 +56,12 @@ fi source /etc/profile.d/alljava.sh %endif # use RPM_OPT_FLAGS, ... -# FIXME: -fno-omit-frame-pointer is needed in LO-4.0; the order of compliation flags is already fixed in master for LO-4.1 -# The current situation causes build (bridge test) failure on i586 systems -ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g'` -fno-strict-aliasing -fno-omit-frame-pointer" +# 12.3 has broken cppconnector with wrong incude paths +%if 0%{?suse_version} == 01230 +ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g'` -fno-strict-aliasing -I/usr/include/mysql-connector/ " +%else +ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g'` -fno-strict-aliasing" +%endif CFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS @@ -76,4 +79,3 @@ export PATH="$RPM_BUILD_DIR/libreoffice-%version/zip30:$PATH" export PYTHON=/usr/bin/python export PYTHON_CFLAGS=`pkg-config --cflags python` export PYTHON_LIBS=`pkg-config --libs python` - diff --git a/buildfix-sdext-poppler-0.23.0.diff b/buildfix-sdext-poppler-0.23.0.diff index 9d0c6b5..24c82da 100644 --- a/buildfix-sdext-poppler-0.23.0.diff +++ b/buildfix-sdext-poppler-0.23.0.diff @@ -1,8 +1,6 @@ -Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -=================================================================== ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -181,7 +181,11 @@ namespace pdfi +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.old 2013-06-20 09:13:52.000000000 +0200 ++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2013-07-16 15:49:35.000000000 +0200 +@@ -178,7 +178,11 @@ namespace pdfi virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE; // Start a page. @@ -15,12 +13,10 @@ Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx // End a page. virtual void endPage() SAL_OVERRIDE; -Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -=================================================================== ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -481,7 +481,11 @@ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : - { +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.old 2013-06-20 09:13:52.000000000 +0200 ++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2013-07-16 15:49:21.000000000 +0200 +@@ -491,7 +491,11 @@ PDFOutDev::~PDFOutDev() + delete m_pUtf8Map; } -void PDFOutDev::startPage(int /*pageNum*/, GfxState* state) diff --git a/buildfix-sfx2-dependency.diff b/buildfix-sfx2-dependency.diff deleted file mode 100644 index fdb7754..0000000 --- a/buildfix-sfx2-dependency.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- sfx2/Library_sfx.mk.old 2013-04-16 18:14:55.000000000 +0200 -+++ sfx2/Library_sfx.mk 2013-04-19 13:25:37.000000000 +0200 -@@ -22,6 +22,7 @@ $(eval $(call gb_Library_Library,sfx)) - $(eval $(call gb_Library_use_packages,sfx,\ - sfx2_inc \ - sfx2_sdi \ -+ svx_inc \ - )) - - $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) diff --git a/c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 b/c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 new file mode 100644 index 0000000..b239209 --- /dev/null +++ b/c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed +size 902229 diff --git a/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz b/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz deleted file mode 100644 index 1693192..0000000 --- a/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a77fcfd20fea2c6e53761d6dcbbee3fdb35e5308de36c1daa0d2014e5a96afe -size 3989935 diff --git a/d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 b/d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 deleted file mode 100644 index 6354c1c..0000000 --- a/d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f19ac75d5ecf95287c532f079fd9507533d3f221675ec8b6b61ac98f2697ad72 -size 405362 diff --git a/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 b/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 new file mode 100644 index 0000000..e6e5daa --- /dev/null +++ b/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e632373149c0b29a971aa74c079f8825bc6bc7b09c0899c8de004ee7e72ad765 +size 1445106 diff --git a/fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip b/fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip deleted file mode 100644 index 42a2131..0000000 --- a/fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbd8b4f5a9f94cd55fd069f11bf79be9e2e290867ae7499c52930f9ac55ef2b4 -size 4859398 diff --git a/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz b/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz deleted file mode 100644 index 82463d4..0000000 --- a/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:066b786ac12f75940a5b8ead444c824460f53feb6f6161a110dcf16efd5c7de3 -size 1117561 diff --git a/fix-collision.patch b/fix-collision.patch new file mode 100644 index 0000000..d77b097 --- /dev/null +++ b/fix-collision.patch @@ -0,0 +1,43 @@ +Index: libreoffice-4.1.0.1/bin/distro-install-file-lists +=================================================================== +--- libreoffice-4.1.0.1.orig/bin/distro-install-file-lists ++++ libreoffice-4.1.0.1/bin/distro-install-file-lists +@@ -219,7 +219,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th + # tde subpackage + test -f $DESTDIR/gid_Module_Optional_Tde && cp $DESTDIR/gid_Module_Optional_Tde tde_list.txt || : + mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/tdefilepicker +- mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/fps_tde.uno.so ++ mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/fps_tdelo.so + mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libvclplug_tdel..so + mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeab1l..so + mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeabdrv1l..so +@@ -228,23 +228,25 @@ if test "z$OOO_VENDOR" != "zDebian" ; th + # kde subpackage + test -f $DESTDIR/gid_Module_Optional_Kde && cp $DESTDIR/gid_Module_Optional_Kde kde_list.txt || : + mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/kdefilepicker +- mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/fps_kde.uno.so ++ mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/fps_kdelo.so + mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kdel..so + mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkab1l..so + mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkabdrv1l..so + add_used_directories kde_list.txt common_list.txt + + # create kde4 subpackage +- mv_file_between_flists kde4_list.txt kde_list.txt $INSTALLDIR/program/kde4be1.uno.so ++ # FIXME: libkde4be1lo.so is listen in two file lists (fdo#66072) ++ mv_file_between_flists kde4_list.txt kde_list.txt $INSTALLDIR/program/libkde4be1lo.so ++ mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/libkde4be1lo.so + mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kde4l..so +- mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/fps_kde4.uno.so ++ mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/fps_kde4lo.so + add_used_directories kde4_list.txt common_list.txt + + # gnome subpackage + test -f $DESTDIR/gid_Module_Optional_Gnome && cp $DESTDIR/gid_Module_Optional_Gnome gnome_list.txt || : + mv_file_between_flists gnome_list.txt common_list.txt $INSTALLDIR/program/libevoab2.so + mv_file_between_flists gnome_list.txt common_list.txt $INSTALLDIR/program/libvclplug_gtk[0-9]*l..so +- mv_file_between_flists common_list.txt gnome_list.txt $INSTALLDIR/program/ucpgvfs1.uno.so ++ mv_file_between_flists common_list.txt gnome_list.txt $INSTALLDIR/program/ucpgvfs1lo.so + add_used_directories gnome_list.txt common_list.txt + + # mono subpackage diff --git a/install-with-hardlinks.diff b/install-with-hardlinks.diff index 2af9075..ae13322 100644 --- a/install-with-hardlinks.diff +++ b/install-with-hardlinks.diff @@ -1,15 +1,12 @@ ---- solenv/bin/modules/installer/worker.pm.old 2012-11-07 15:41:56.000000000 +0100 -+++ solenv/bin/modules/installer/worker.pm 2012-11-15 17:46:20.000000000 +0100 -@@ -519,7 +519,11 @@ sub install_simple ($$$$$$) - unlink "$destdir$destination"; +diff -urN libreoffice-4.1.0.0.beta1.old/solenv/bin/modules/installer/worker.pm libreoffice-4.1.0.0.beta1/solenv/bin/modules/installer/worker.pm +--- libreoffice-4.1.0.0.beta1.old/solenv/bin/modules/installer/worker.pm 2013-05-27 14:04:19.186304208 +0200 ++++ libreoffice-4.1.0.0.beta1/solenv/bin/modules/installer/worker.pm 2013-05-27 15:10:46.283303732 +0200 +@@ -377,7 +377,7 @@ + symlink (readlink ("$sourcepath"), "$destdir$destination") || die "Can't symlink $destdir$destination -> " . readlink ("$sourcepath") . "$!"; } - -- copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!"; -+ my $copied = 0; -+ # try to save space by hardlinking files; symlinks can't be hardlinked ;-) -+ $copied = link ("$sourcepath", "$destdir$destination") if (! -l $sourcepath); -+ $copied = copy ("$sourcepath", "$destdir$destination") if (! $copied); -+ die "Can't copy file: $sourcepath -> $destdir$destination $!" if (! $copied); - my $sourcestat = stat($sourcepath); - utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination"); - chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!"; + else { +- copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!"; ++ link ("$sourcepath", "$destdir$destination") || die "Can't hardlink file: $sourcepath -> $destdir$destination $!"; + my $sourcestat = stat($sourcepath); + utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination"); + chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!"; diff --git a/libmwaw-0.1.10.tar.bz2 b/libmwaw-0.1.10.tar.bz2 new file mode 100644 index 0000000..1255689 --- /dev/null +++ b/libmwaw-0.1.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e08aab35255801bcd126424756f2614870f8c105ea2b81e93367287d6eb117b1 +size 901314 diff --git a/libreoffice-4.0.3.3.5.tar.xz b/libreoffice-4.0.3.3.5.tar.xz deleted file mode 100644 index a33cfe5..0000000 --- a/libreoffice-4.0.3.3.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b884dae53e6195c0e7bc546ca8d4a669064e92f34628c0e564198a7ca9a7f610 -size 106460952 diff --git a/libreoffice-4.1.0.4.tar.xz b/libreoffice-4.1.0.4.tar.xz new file mode 100644 index 0000000..1fd8c56 --- /dev/null +++ b/libreoffice-4.1.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e42a149f37043f8a2e4456779324745621683c759bb451fcd69539f219d8075 +size 121670716 diff --git a/libreoffice-branding-upstream.changes b/libreoffice-branding-upstream.changes index 81e4d3b..dad296e 100644 --- a/libreoffice-branding-upstream.changes +++ b/libreoffice-branding-upstream.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + +- update to 4.1.0.4 with very big help from tchvatal@suse.com + ------------------------------------------------------------------- Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec index b0dbaaa..ea9ab0c 100644 --- a/libreoffice-branding-upstream.spec +++ b/libreoffice-branding-upstream.spec @@ -17,7 +17,7 @@ Name: libreoffice-branding-upstream -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define lo_home libreoffice Summary: Original Branding for LibreOffice diff --git a/libreoffice-help-4.0.3.3.5.tar.xz b/libreoffice-help-4.0.3.3.5.tar.xz deleted file mode 100644 index a6d6188..0000000 --- a/libreoffice-help-4.0.3.3.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67c6385d01fe41a212213262c381a30d66f848ba57b6d0bf70255bbb224d42d0 -size 1911556 diff --git a/libreoffice-help-4.1.0.4.tar.xz b/libreoffice-help-4.1.0.4.tar.xz new file mode 100644 index 0000000..acc090b --- /dev/null +++ b/libreoffice-help-4.1.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:273003ceb9758ab0f4ee1952b61f787353d55e059a93ff9ca4141a5d59d5e0a0 +size 1847260 diff --git a/libreoffice-help-en-US.changes b/libreoffice-help-en-US.changes index 956c0a0..b00b5b1 100644 --- a/libreoffice-help-en-US.changes +++ b/libreoffice-help-en-US.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + +- update to 4.1.0.4 with very big help from tchvatal@suse.com +- removed obsolete patches: + + bridges-missing-cxxflags.diff: fixed better way + + build-max-64-jobs.diff: dmake is not longer used +- update configure switches: + - temporary remove the unknown --disable-mono + - remove the obsolete --without-system-mozilla +- build all dependencies, including helpcompiler and xmlhelp +- install files from workdir instead of solver; caused by the + switch from dmake to GNU make + ------------------------------------------------------------------- Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index 8938f61..06a7a1a 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -22,19 +22,19 @@ Name: libreoffice-help-en-US ## Generated by: ## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US ################################################################### -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 %define zip_version 3.0 -%define lo_langs "" +%define lo_langs "" %define lo_home libreoffice -# debug_build: 0 = no -# 1 = yes (enable depency tracking, ccache) -%define debug_build 0 -# prepare_build: 0 = no -# 1 = yes (just build, install and create packages; without %%prep section and configure) -%define prepare_build 1 +# debug_build: 0 = no +# 1 = yes (enable depency tracking, ccache) +%define debug_build 0 +# prepare_build: 0 = no +# 1 = yes (just build, install and create packages; without %%prep section and configure) +%define prepare_build 1 #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 BuildRequires: ant @@ -120,13 +120,8 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-en-US.spec.in Source201: lo-help-gen-spec Source202: lo-help-en-US -# lost RPM optflags when compiling bridges -Patch1: bridges-missing-cxxflags.diff -# dmake does not work with more than 64 jobs -# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed -Patch2: build-max-64-jobs.diff -# try to avoid build depency on vcl -Patch3: split-help-buildhack-no-vcl.diff + +Patch0: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -149,9 +144,6 @@ stuff is in LibreOffice-l10n-en-US. %setup -D -T -q -n libreoffice-%version %else %setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version -%patch1 -%patch2 -%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -166,6 +158,7 @@ cd zip30 cd - %endif %endif +%patch0 -p1 %build %{expand:%(cat %_sourcedir/build_prepare.inc)} @@ -196,15 +189,13 @@ cd - --disable-dbus \ --disable-gstreamer-0-10 \ --disable-python \ - --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-system-mozilla \ %if %suse_version < 1210 - --without-system-icu \ + --without-system-icu \ %endif --disable-postgresql-sdbc \ --disable-cups \ @@ -214,10 +205,13 @@ cd - --with-system-cppunit \ --with-system-expat \ --with-system-boost \ - --without-system-jpeg + --without-system-jpeg %endif # build helpcontent2 module and all its pre-requisites +make helpcompiler.all +make xmlhelp.all make helpcontent2.all +make helpcontent2 %install sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" @@ -229,9 +223,11 @@ mkdir -p file-lists for lang in $langs ; do test "$lang" = "en-US" && langdir="en" || langdir="$lang" mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir - for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do - unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir + for dir in workdir/$INPATH/HelpTarget/*; do + cp -r $dir/$lang/s* $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir done + # copy also html and css + cp -r workdir/$INPATH/HelpTarget/shared/$lang/*.{html,css} $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir lang_underscore=`echo $lang | sed "s/-/_/g"` filelist=help_${lang_underscore}_list.txt echo "%dir %_datadir/%lo_home" >file-lists/$filelist diff --git a/libreoffice-help-en-US.spec.in b/libreoffice-help-en-US.spec.in index cac572b..68cd37c 100644 --- a/libreoffice-help-en-US.spec.in +++ b/libreoffice-help-en-US.spec.in @@ -18,22 +18,21 @@ Name: libreoffice-help-en-US @DO_NOT_EDIT_COMMENT@ -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 %define zip_version 3.0 -%define lo_langs "" +%define lo_langs "" %define lo_home libreoffice -# debug_build: 0 = no -# 1 = yes (enable depency tracking, ccache) -%define debug_build 0 -# prepare_build: 0 = no -# 1 = yes (just build, install and create packages; without %%prep section and configure) -%define prepare_build 1 +# debug_build: 0 = no +# 1 = yes (enable depency tracking, ccache) +%define debug_build 0 +# prepare_build: 0 = no +# 1 = yes (just build, install and create packages; without %%prep section and configure) +%define prepare_build 1 #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 -BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -59,6 +58,7 @@ BuildRequires: pkg-config BuildRequires: procps BuildRequires: unzip BuildRequires: xorg-x11-devel +BuildRequires: xz BuildRequires: zip %if 0%{?suse_version} == 01010 # is not required by Java SDKs by mistake on SLED10 @@ -116,13 +116,8 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-en-US.spec.in Source201: lo-help-gen-spec Source202: lo-help-en-US -# lost RPM optflags when compiling bridges -Patch1: bridges-missing-cxxflags.diff -# dmake does not work with more than 64 jobs -# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed -Patch2: build-max-64-jobs.diff -# try to avoid build depency on vcl -Patch3: split-help-buildhack-no-vcl.diff + +Patch0: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -145,9 +140,6 @@ stuff is in LibreOffice-l10n-en-US. %setup -D -T -q -n libreoffice-%version %else %setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version -%patch1 -%patch2 -%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -162,6 +154,7 @@ cd zip30 cd - %endif %endif +%patch0 -p1 %build %{expand:%(cat %_sourcedir/build_prepare.inc)} @@ -192,15 +185,13 @@ cd - --disable-dbus \ --disable-gstreamer-0-10 \ --disable-python \ - --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-system-mozilla \ %if %suse_version < 1210 - --without-system-icu \ + --without-system-icu \ %endif --disable-postgresql-sdbc \ --disable-cups \ @@ -210,10 +201,13 @@ cd - --with-system-cppunit \ --with-system-expat \ --with-system-boost \ - --without-system-jpeg + --without-system-jpeg %endif # build helpcontent2 module and all its pre-requisites +make helpcompiler.all +make xmlhelp.all make helpcontent2.all +make helpcontent2 %install sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" @@ -225,9 +219,11 @@ mkdir -p file-lists for lang in $langs ; do test "$lang" = "en-US" && langdir="en" || langdir="$lang" mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir - for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do - unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir + for dir in workdir/$INPATH/HelpTarget/*; do + cp -r $dir/$lang/s* $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir done + # copy also html and css + cp -r workdir/$INPATH/HelpTarget/shared/$lang/*.{html,css} $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir lang_underscore=`echo $lang | sed "s/-/_/g"` filelist=help_${lang_underscore}_list.txt echo "%dir %_datadir/%lo_home" >file-lists/$filelist diff --git a/libreoffice-help-group1.changes b/libreoffice-help-group1.changes index 23f64b1..0955bfb 100644 --- a/libreoffice-help-group1.changes +++ b/libreoffice-help-group1.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + +- update to 4.1.0.4 with very big help from tchvatal@suse.com +- removed obsolete patches: + + bridges-missing-cxxflags.diff: fixed better way + + build-max-64-jobs.diff: dmake is not longer used +- update configure switches: + - temporary remove the unknown --disable-mono + - remove the obsolete --without-system-mozilla +- build all dependencies, including helpcompiler, xmlhelp, and l10ntools +- install files from workdir instead of solver; caused by the + switch from dmake to GNU make + ------------------------------------------------------------------- Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index e65d99b..5b2418b 100644 --- a/libreoffice-help-group1.spec +++ b/libreoffice-help-group1.spec @@ -22,29 +22,29 @@ Name: libreoffice-help-group1 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 %define zip_version 3.0 %define lo_home libreoffice -# test_build_langs: 1 = de and cs -# 2 = all supported languages -%define test_build_langs 2 -# debug_build: 0 = no -# 1 = yes (enable depency tracking, ccache) -%define debug_build 0 -# prepare_build: 0 = no -# 1 = yes (just build, install and create packages; without %%prep section and configure) -%define prepare_build 1 +# test_build_langs: 1 = de and cs +# 2 = all supported languages +%define test_build_langs 2 +# debug_build: 0 = no +# 1 = yes (enable depency tracking, ccache) +%define debug_build 0 +# prepare_build: 0 = no +# 1 = yes (just build, install and create packages; without %%prep section and configure) +%define prepare_build 1 # %if %test_build_langs == 0 -%define lo_langs "" +%define lo_langs "" %else %if %test_build_langs == 1 -%define lo_langs "cs de" +%define lo_langs "cs de" %else -%define lo_langs "ast bg ca cs da de en-GB" +%define lo_langs "ast bg ca cs da de en-GB" %endif %endif #!BuildIgnore: libreoffice @@ -101,13 +101,8 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# lost RPM optflags when compiling bridges -Patch1: bridges-missing-cxxflags.diff -# dmake does not work with more than 64 jobs -# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed -Patch2: build-max-64-jobs.diff -# try to avoid build depency on vcl -Patch3: split-help-buildhack-no-vcl.diff + +Patch0: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -333,9 +328,6 @@ is in libreoffice-l10n-en-GB. %setup -D -T -q -n libreoffice-%version %else %setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version -%patch1 -%patch2 -%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -350,6 +342,7 @@ cd zip30 cd - %endif %endif +%patch0 -p1 %build %{expand:%(cat %_sourcedir/build_prepare.inc)} @@ -380,15 +373,13 @@ cd - --disable-dbus \ --disable-gstreamer-0-10 \ --disable-python \ - --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-system-mozilla \ %if %suse_version < 1210 - --without-system-icu \ + --without-system-icu \ %endif --disable-postgresql-sdbc \ --disable-cups \ @@ -398,10 +389,14 @@ cd - --with-system-cppunit \ --with-system-expat \ --with-system-boost \ - --without-system-jpeg + --without-system-jpeg %endif # build helpcontent2 module and all its pre-requisites +make helpcompiler.all +make xmlhelp.all make helpcontent2.all +make l10ntools.all +make helpcontent2 %install sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" @@ -413,9 +408,11 @@ mkdir -p file-lists for lang in $langs ; do test "$lang" = "en-US" && langdir="en" || langdir="$lang" mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir - for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do - unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir + for dir in workdir/$INPATH/HelpTarget/*; do + cp -r $dir/$lang/s* $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir done + # copy also html and css + cp -r workdir/$INPATH/HelpTarget/shared/$lang/*.{html,css} $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir lang_underscore=`echo $lang | sed "s/-/_/g"` filelist=help_${lang_underscore}_list.txt echo "%dir %_datadir/%lo_home" >file-lists/$filelist diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes index c38999f..d56b7af 100644 --- a/libreoffice-help-group2.changes +++ b/libreoffice-help-group2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + +- update to 4.1.0.4 with very big help from tchvatal@suse.com +- removed obsolete patches: + + bridges-missing-cxxflags.diff: fixed better way + + build-max-64-jobs.diff: dmake is not longer used +- update configure switches: + - temporary remove the unknown --disable-mono + - remove the obsolete --without-system-mozilla +- build all dependencies, including helpcompiler, xmlhelp, and l10ntools +- install files from workdir instead of solver; caused by the + switch from dmake to GNU make + ------------------------------------------------------------------- Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index d1337eb..209d489 100644 --- a/libreoffice-help-group2.spec +++ b/libreoffice-help-group2.spec @@ -22,29 +22,29 @@ Name: libreoffice-help-group2 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 %define zip_version 3.0 %define lo_home libreoffice -# test_build_langs: 1 = de and cs -# 2 = all supported languages -%define test_build_langs 2 -# debug_build: 0 = no -# 1 = yes (enable depency tracking, ccache) -%define debug_build 0 -# prepare_build: 0 = no -# 1 = yes (just build, install and create packages; without %%prep section and configure) -%define prepare_build 1 +# test_build_langs: 1 = de and cs +# 2 = all supported languages +%define test_build_langs 2 +# debug_build: 0 = no +# 1 = yes (enable depency tracking, ccache) +%define debug_build 0 +# prepare_build: 0 = no +# 1 = yes (just build, install and create packages; without %%prep section and configure) +%define prepare_build 1 # %if %test_build_langs == 0 -%define lo_langs "" +%define lo_langs "" %else %if %test_build_langs == 1 -%define lo_langs "" +%define lo_langs "" %else -%define lo_langs "el en-ZA es et eu fi fr" +%define lo_langs "el en-ZA es et eu fi fr" %endif %endif #!BuildIgnore: libreoffice @@ -101,13 +101,8 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# lost RPM optflags when compiling bridges -Patch1: bridges-missing-cxxflags.diff -# dmake does not work with more than 64 jobs -# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed -Patch2: build-max-64-jobs.diff -# try to avoid build depency on vcl -Patch3: split-help-buildhack-no-vcl.diff + +Patch0: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -321,9 +316,6 @@ is in libreoffice-l10n-fr. %setup -D -T -q -n libreoffice-%version %else %setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version -%patch1 -%patch2 -%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -338,6 +330,7 @@ cd zip30 cd - %endif %endif +%patch0 -p1 %build %{expand:%(cat %_sourcedir/build_prepare.inc)} @@ -368,15 +361,13 @@ cd - --disable-dbus \ --disable-gstreamer-0-10 \ --disable-python \ - --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-system-mozilla \ %if %suse_version < 1210 - --without-system-icu \ + --without-system-icu \ %endif --disable-postgresql-sdbc \ --disable-cups \ @@ -386,10 +377,14 @@ cd - --with-system-cppunit \ --with-system-expat \ --with-system-boost \ - --without-system-jpeg + --without-system-jpeg %endif # build helpcontent2 module and all its pre-requisites +make helpcompiler.all +make xmlhelp.all make helpcontent2.all +make l10ntools.all +make helpcontent2 %install sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" @@ -401,9 +396,11 @@ mkdir -p file-lists for lang in $langs ; do test "$lang" = "en-US" && langdir="en" || langdir="$lang" mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir - for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do - unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir + for dir in workdir/$INPATH/HelpTarget/*; do + cp -r $dir/$lang/s* $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir done + # copy also html and css + cp -r workdir/$INPATH/HelpTarget/shared/$lang/*.{html,css} $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir lang_underscore=`echo $lang | sed "s/-/_/g"` filelist=help_${lang_underscore}_list.txt echo "%dir %_datadir/%lo_home" >file-lists/$filelist diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes index d493364..812ec3f 100644 --- a/libreoffice-help-group3.changes +++ b/libreoffice-help-group3.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + +- update to 4.1.0.4 with very big help from tchvatal@suse.com +- removed obsolete patches: + + bridges-missing-cxxflags.diff: fixed better way + + build-max-64-jobs.diff: dmake is not longer used +- update configure switches: + - temporary remove the unknown --disable-mono + - remove the obsolete --without-system-mozilla +- build all dependencies, including helpcompiler, xmlhelp, and l10ntools +- install files from workdir instead of solver; caused by the + switch from dmake to GNU make + ------------------------------------------------------------------- Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index 9840d6c..a71cf12 100644 --- a/libreoffice-help-group3.spec +++ b/libreoffice-help-group3.spec @@ -22,29 +22,29 @@ Name: libreoffice-help-group3 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 %define zip_version 3.0 %define lo_home libreoffice -# test_build_langs: 1 = de and cs -# 2 = all supported languages -%define test_build_langs 2 -# debug_build: 0 = no -# 1 = yes (enable depency tracking, ccache) -%define debug_build 0 -# prepare_build: 0 = no -# 1 = yes (just build, install and create packages; without %%prep section and configure) -%define prepare_build 1 +# test_build_langs: 1 = de and cs +# 2 = all supported languages +%define test_build_langs 2 +# debug_build: 0 = no +# 1 = yes (enable depency tracking, ccache) +%define debug_build 0 +# prepare_build: 0 = no +# 1 = yes (just build, install and create packages; without %%prep section and configure) +%define prepare_build 1 # %if %test_build_langs == 0 -%define lo_langs "" +%define lo_langs "" %else %if %test_build_langs == 1 -%define lo_langs "hu ja" +%define lo_langs "hu ja" %else -%define lo_langs "gl gu hi hu it ja km" +%define lo_langs "gl gu hi hu it ja km" %endif %endif #!BuildIgnore: libreoffice @@ -101,13 +101,8 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# lost RPM optflags when compiling bridges -Patch1: bridges-missing-cxxflags.diff -# dmake does not work with more than 64 jobs -# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed -Patch2: build-max-64-jobs.diff -# try to avoid build depency on vcl -Patch3: split-help-buildhack-no-vcl.diff + +Patch0: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -333,9 +328,6 @@ is in libreoffice-l10n-km. %setup -D -T -q -n libreoffice-%version %else %setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version -%patch1 -%patch2 -%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -350,6 +342,7 @@ cd zip30 cd - %endif %endif +%patch0 -p1 %build %{expand:%(cat %_sourcedir/build_prepare.inc)} @@ -380,15 +373,13 @@ cd - --disable-dbus \ --disable-gstreamer-0-10 \ --disable-python \ - --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-system-mozilla \ %if %suse_version < 1210 - --without-system-icu \ + --without-system-icu \ %endif --disable-postgresql-sdbc \ --disable-cups \ @@ -398,10 +389,14 @@ cd - --with-system-cppunit \ --with-system-expat \ --with-system-boost \ - --without-system-jpeg + --without-system-jpeg %endif # build helpcontent2 module and all its pre-requisites +make helpcompiler.all +make xmlhelp.all make helpcontent2.all +make l10ntools.all +make helpcontent2 %install sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" @@ -413,9 +408,11 @@ mkdir -p file-lists for lang in $langs ; do test "$lang" = "en-US" && langdir="en" || langdir="$lang" mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir - for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do - unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir + for dir in workdir/$INPATH/HelpTarget/*; do + cp -r $dir/$lang/s* $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir done + # copy also html and css + cp -r workdir/$INPATH/HelpTarget/shared/$lang/*.{html,css} $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir lang_underscore=`echo $lang | sed "s/-/_/g"` filelist=help_${lang_underscore}_list.txt echo "%dir %_datadir/%lo_home" >file-lists/$filelist diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes index 42af5e8..3287146 100644 --- a/libreoffice-help-group4.changes +++ b/libreoffice-help-group4.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + +- update to 4.1.0.4 with very big help from tchvatal@suse.com +- removed obsolete patches: + + bridges-missing-cxxflags.diff: fixed better way + + build-max-64-jobs.diff: dmake is not longer used +- update configure switches: + - temporary remove the unknown --disable-mono + - remove the obsolete --without-system-mozilla +- build all dependencies, including helpcompiler, xmlhelp, and l10ntools +- install files from workdir instead of solver; caused by the + switch from dmake to GNU make + ------------------------------------------------------------------- Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index ce4953c..6281e2a 100644 --- a/libreoffice-help-group4.spec +++ b/libreoffice-help-group4.spec @@ -22,29 +22,29 @@ Name: libreoffice-help-group4 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 %define zip_version 3.0 %define lo_home libreoffice -# test_build_langs: 1 = de and cs -# 2 = all supported languages -%define test_build_langs 2 -# debug_build: 0 = no -# 1 = yes (enable depency tracking, ccache) -%define debug_build 0 -# prepare_build: 0 = no -# 1 = yes (just build, install and create packages; without %%prep section and configure) -%define prepare_build 1 +# test_build_langs: 1 = de and cs +# 2 = all supported languages +%define test_build_langs 2 +# debug_build: 0 = no +# 1 = yes (enable depency tracking, ccache) +%define debug_build 0 +# prepare_build: 0 = no +# 1 = yes (just build, install and create packages; without %%prep section and configure) +%define prepare_build 1 # %if %test_build_langs == 0 -%define lo_langs "" +%define lo_langs "" %else %if %test_build_langs == 1 -%define lo_langs "" +%define lo_langs "" %else -%define lo_langs "ko mk nb nl pl pt pt-BR" +%define lo_langs "ko mk nb nl pl pt pt-BR" %endif %endif #!BuildIgnore: libreoffice @@ -101,13 +101,8 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# lost RPM optflags when compiling bridges -Patch1: bridges-missing-cxxflags.diff -# dmake does not work with more than 64 jobs -# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed -Patch2: build-max-64-jobs.diff -# try to avoid build depency on vcl -Patch3: split-help-buildhack-no-vcl.diff + +Patch0: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -321,9 +316,6 @@ is in libreoffice-l10n-pt-BR. %setup -D -T -q -n libreoffice-%version %else %setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version -%patch1 -%patch2 -%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -338,6 +330,7 @@ cd zip30 cd - %endif %endif +%patch0 -p1 %build %{expand:%(cat %_sourcedir/build_prepare.inc)} @@ -368,15 +361,13 @@ cd - --disable-dbus \ --disable-gstreamer-0-10 \ --disable-python \ - --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-system-mozilla \ %if %suse_version < 1210 - --without-system-icu \ + --without-system-icu \ %endif --disable-postgresql-sdbc \ --disable-cups \ @@ -386,10 +377,14 @@ cd - --with-system-cppunit \ --with-system-expat \ --with-system-boost \ - --without-system-jpeg + --without-system-jpeg %endif # build helpcontent2 module and all its pre-requisites +make helpcompiler.all +make xmlhelp.all make helpcontent2.all +make l10ntools.all +make helpcontent2 %install sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" @@ -401,9 +396,11 @@ mkdir -p file-lists for lang in $langs ; do test "$lang" = "en-US" && langdir="en" || langdir="$lang" mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir - for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do - unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir + for dir in workdir/$INPATH/HelpTarget/*; do + cp -r $dir/$lang/s* $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir done + # copy also html and css + cp -r workdir/$INPATH/HelpTarget/shared/$lang/*.{html,css} $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir lang_underscore=`echo $lang | sed "s/-/_/g"` filelist=help_${lang_underscore}_list.txt echo "%dir %_datadir/%lo_home" >file-lists/$filelist diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes index e716fb3..7fd4da8 100644 --- a/libreoffice-help-group5.changes +++ b/libreoffice-help-group5.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + +- update to 4.1.0.4 with very big help from tchvatal@suse.com +- removed obsolete patches: + + bridges-missing-cxxflags.diff: fixed better way + + build-max-64-jobs.diff: dmake is not longer used +- update configure switches: + - temporary remove the unknown --disable-mono + - remove the obsolete --without-system-mozilla +- build all dependencies, including helpcompiler, xmlhelp, and l10ntools +- install files from workdir instead of solver; caused by the + switch from dmake to GNU make + ------------------------------------------------------------------- Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index b2df35f..6afb8b0 100644 --- a/libreoffice-help-group5.spec +++ b/libreoffice-help-group5.spec @@ -22,29 +22,29 @@ Name: libreoffice-help-group5 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 %define zip_version 3.0 %define lo_home libreoffice -# test_build_langs: 1 = de and cs -# 2 = all supported languages -%define test_build_langs 2 -# debug_build: 0 = no -# 1 = yes (enable depency tracking, ccache) -%define debug_build 0 -# prepare_build: 0 = no -# 1 = yes (just build, install and create packages; without %%prep section and configure) -%define prepare_build 1 +# test_build_langs: 1 = de and cs +# 2 = all supported languages +%define test_build_langs 2 +# debug_build: 0 = no +# 1 = yes (enable depency tracking, ccache) +%define debug_build 0 +# prepare_build: 0 = no +# 1 = yes (just build, install and create packages; without %%prep section and configure) +%define prepare_build 1 # %if %test_build_langs == 0 -%define lo_langs "" +%define lo_langs "" %else %if %test_build_langs == 1 -%define lo_langs "" +%define lo_langs "" %else -%define lo_langs "ru sk sl sv tr vi zh-CN zh-TW" +%define lo_langs "ru sk sl sv tr vi zh-CN zh-TW" %endif %endif #!BuildIgnore: libreoffice @@ -101,13 +101,8 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# lost RPM optflags when compiling bridges -Patch1: bridges-missing-cxxflags.diff -# dmake does not work with more than 64 jobs -# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed -Patch2: build-max-64-jobs.diff -# try to avoid build depency on vcl -Patch3: split-help-buildhack-no-vcl.diff + +Patch0: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -348,9 +343,6 @@ is in libreoffice-l10n-zh-TW. %setup -D -T -q -n libreoffice-%version %else %setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version -%patch1 -%patch2 -%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -365,6 +357,7 @@ cd zip30 cd - %endif %endif +%patch0 -p1 %build %{expand:%(cat %_sourcedir/build_prepare.inc)} @@ -395,15 +388,13 @@ cd - --disable-dbus \ --disable-gstreamer-0-10 \ --disable-python \ - --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-system-mozilla \ %if %suse_version < 1210 - --without-system-icu \ + --without-system-icu \ %endif --disable-postgresql-sdbc \ --disable-cups \ @@ -413,10 +404,14 @@ cd - --with-system-cppunit \ --with-system-expat \ --with-system-boost \ - --without-system-jpeg + --without-system-jpeg %endif # build helpcontent2 module and all its pre-requisites +make helpcompiler.all +make xmlhelp.all make helpcontent2.all +make l10ntools.all +make helpcontent2 %install sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" @@ -428,9 +423,11 @@ mkdir -p file-lists for lang in $langs ; do test "$lang" = "en-US" && langdir="en" || langdir="$lang" mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir - for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do - unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir + for dir in workdir/$INPATH/HelpTarget/*; do + cp -r $dir/$lang/s* $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir done + # copy also html and css + cp -r workdir/$INPATH/HelpTarget/shared/$lang/*.{html,css} $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir lang_underscore=`echo $lang | sed "s/-/_/g"` filelist=help_${lang_underscore}_list.txt echo "%dir %_datadir/%lo_home" >file-lists/$filelist diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index af266a3..919ed40 100644 --- a/libreoffice-help-groupX.spec.in +++ b/libreoffice-help-groupX.spec.in @@ -18,34 +18,33 @@ Name: libreoffice-help-group@GROUP_NUMBER@ @DO_NOT_EDIT_COMMENT@ -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 %define zip_version 3.0 %define lo_home libreoffice -# test_build_langs: 1 = de and cs -# 2 = all supported languages -%define test_build_langs 2 -# debug_build: 0 = no -# 1 = yes (enable depency tracking, ccache) -%define debug_build 0 -# prepare_build: 0 = no -# 1 = yes (just build, install and create packages; without %%prep section and configure) -%define prepare_build 1 +# test_build_langs: 1 = de and cs +# 2 = all supported languages +%define test_build_langs 2 +# debug_build: 0 = no +# 1 = yes (enable depency tracking, ccache) +%define debug_build 0 +# prepare_build: 0 = no +# 1 = yes (just build, install and create packages; without %%prep section and configure) +%define prepare_build 1 # %if %test_build_langs == 0 -%define lo_langs "@OOO_LANGS_MIN_0@" +%define lo_langs "@OOO_LANGS_MIN_0@" %else %if %test_build_langs == 1 -%define lo_langs "@OOO_LANGS_MIN_1@" +%define lo_langs "@OOO_LANGS_MIN_1@" %else -%define lo_langs "@OOO_LANGS_MIN_2@" +%define lo_langs "@OOO_LANGS_MIN_2@" %endif %endif #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 -BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -71,6 +70,7 @@ BuildRequires: pkg-config BuildRequires: procps BuildRequires: unzip BuildRequires: xorg-x11-devel +BuildRequires: xz BuildRequires: zip %if 0%{?suse_version} == 01010 # is not required by Java SDKs by mistake on SLED10 @@ -97,13 +97,8 @@ Source31: zip-%zip_version.tar.bz2 Source200: libreoffice-help-groupX.spec.in Source201: lo-help-gen-spec Source202: lo-help-groupX -# lost RPM optflags when compiling bridges -Patch1: bridges-missing-cxxflags.diff -# dmake does not work with more than 64 jobs -# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed -Patch2: build-max-64-jobs.diff -# try to avoid build depency on vcl -Patch3: split-help-buildhack-no-vcl.diff + +Patch0: split-help-buildhack-no-vcl.diff # # Patches against zip-3.0 Patch2000: zip-3.0-iso8859_2.patch @@ -126,9 +121,6 @@ development. %setup -D -T -q -n libreoffice-%version %else %setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version -%patch1 -%patch2 -%patch3 # # patch zip-3.0 %if %suse_version < 1140 @@ -143,6 +135,7 @@ cd zip30 cd - %endif %endif +%patch0 -p1 %build %{expand:%(cat %_sourcedir/build_prepare.inc)} @@ -173,15 +166,13 @@ cd - --disable-dbus \ --disable-gstreamer-0-10 \ --disable-python \ - --disable-mono \ --disable-odk \ --without-junit \ %if %debug_build == 0 --disable-ccache \ %endif - --without-system-mozilla \ %if %suse_version < 1210 - --without-system-icu \ + --without-system-icu \ %endif --disable-postgresql-sdbc \ --disable-cups \ @@ -191,10 +182,14 @@ cd - --with-system-cppunit \ --with-system-expat \ --with-system-boost \ - --without-system-jpeg + --without-system-jpeg %endif # build helpcontent2 module and all its pre-requisites +make helpcompiler.all +make xmlhelp.all make helpcontent2.all +make l10ntools.all +make helpcontent2 %install sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed" @@ -206,9 +201,11 @@ mkdir -p file-lists for lang in $langs ; do test "$lang" = "en-US" && langdir="en" || langdir="$lang" mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir - for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do - unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir + for dir in workdir/$INPATH/HelpTarget/*; do + cp -r $dir/$lang/s* $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir done + # copy also html and css + cp -r workdir/$INPATH/HelpTarget/shared/$lang/*.{html,css} $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir lang_underscore=`echo $lang | sed "s/-/_/g"` filelist=help_${lang_underscore}_list.txt echo "%dir %_datadir/%lo_home" >file-lists/$filelist diff --git a/libreoffice-icon-themes.changes b/libreoffice-icon-themes.changes index 5837131..d3179ab 100644 --- a/libreoffice-icon-themes.changes +++ b/libreoffice-icon-themes.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + +- update to 4.1.0.4 with very big help from tchvatal@suse.com + ------------------------------------------------------------------- Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com diff --git a/libreoffice-icon-themes.spec b/libreoffice-icon-themes.spec index 8407e1b..039c203 100644 --- a/libreoffice-icon-themes.spec +++ b/libreoffice-icon-themes.spec @@ -17,7 +17,7 @@ Name: libreoffice-icon-themes -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define ooo_home libreoffice BuildRequires: libreoffice-icon-themes-prebuilt = %version diff --git a/libreoffice-l10n.changes b/libreoffice-l10n.changes index dab76e3..f6059c3 100644 --- a/libreoffice-l10n.changes +++ b/libreoffice-l10n.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + +- update to 4.1.0.4 with very big help from tchvatal@suse.com + ------------------------------------------------------------------- Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com diff --git a/libreoffice-l10n.spec b/libreoffice-l10n.spec index 4af6e5f..c35ab78 100644 --- a/libreoffice-l10n.spec +++ b/libreoffice-l10n.spec @@ -22,7 +22,7 @@ ## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data ################################################################### Name: libreoffice-l10n -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define piece l10n %define ooo_home libreoffice diff --git a/libreoffice-l10n.spec.in b/libreoffice-l10n.spec.in index d146ad6..7506d80 100644 --- a/libreoffice-l10n.spec.in +++ b/libreoffice-l10n.spec.in @@ -18,7 +18,7 @@ @DO_NOT_EDIT_COMMENT@ Name: libreoffice-l10n -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 %define piece l10n %define ooo_home libreoffice diff --git a/libreoffice-translations-4.0.3.3.5.tar.xz b/libreoffice-translations-4.0.3.3.5.tar.xz deleted file mode 100644 index 8bfbca4..0000000 --- a/libreoffice-translations-4.0.3.3.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e441ac7adab90545f837ceb3e5afc403e31f60de069b7eced729c20be9956da -size 129284168 diff --git a/libreoffice-translations-4.1.0.4.tar.xz b/libreoffice-translations-4.1.0.4.tar.xz new file mode 100644 index 0000000..8498162 --- /dev/null +++ b/libreoffice-translations-4.1.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:366dd84d06ad63ece03979a3ac2bc16e4318552ab949fc1f8648a4f4d136278a +size 128151924 diff --git a/libreoffice.changes b/libreoffice.changes index 502b70d..46a1657 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,150 @@ +------------------------------------------------------------------- +Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com + +- update to 4.1.0.4 with very big help from tchvatal@suse.com +- Writer + + support font localized forms (fdo#62154) + + gradient background in text frames (fdo#46029) + + easy rotate images in 90 degree increments (fdo#34423) + + non-bitmap DrawingML shapes in DOCX import (fdo#43641) + + graphical numbering bullets in DOC, DOCX and RTF import/export + + several improvements in comments handling (fdo#38246, fdo#34800, fdo#53442) +- Calc + + two new graph types (fdo#61135) + + allow to export charts into ODC (ODF chart) file format + + new functions NUMBERVALUE and SKEWP (fdo#57180, fdo#60322) + + import/export more than 45 functions that are new in Excel 2013 + + import large HTML documents with more than 64k table cells (fdo#35756) +- Impress + + option to disable the bundled Presenter Console + + "Photo Album" allows to create slideshows from a series of pictures +- Base + + allow to limit query results +- Math + + new elements docking panel +- General + + new gallery images from IBM Symphony + + improved hyphenation in Calc and Draw + + delete multiple styles at once (fdo#46718) + + port Agenda and Web wizards from Java to Python + + syntax highlighting of the Basic code in local help + + use HarfBuzz instead of the deprecated ICU LayoutEngine + + lots fixes and improvements in the right-to-left (RTL) support +- Experimental feature: + + sidebar from AOO/IBM Symphony with resizeable layout from LO team +- Filters + + include hyperlinks in SVG export (fdo#47576) + + embedding fonts in Writer, Calc, and Impress documents + + numerous improvements in the OOXML and RTF import/export filters + + allow to include audio and video in more formats: WMA, WMV, AAC, FLV, + OGX, RMI MIDI, SND + + import more file formats: Microsoft Word for Mac 5.1, + Write Now 4.0, MacWrite Pro 1.5, and AppleWorks 6.0 +- GUI + + many more dialogs with resizeable layout + + allow to clear list of recently used documents + + easier access to the recently used documents from a toolbar + + several search bar improvements (fdo#59101, fdo#58526, fdo#63035) +- Performance + + asynchronous word count + + use a hash for auto-correction + + use copy-on-write for RTF import stack + + load label descriptions only when needed +- Infrastructure + + L10ntools refactoring + + completed the port from dmake to GNU make +- Extensions + + ability to translate gallery items + + use sensible names for gallery files +- several API changes, see + https://wiki.documentfoundation.org/ReleaseNotes/4.1#API_Changes for more + details +- about 3000 fixes of reported bugs +- update global compiler glags: + + add -I/usr/include/mysql-connector on openSUSE 12.3 where the system + cppconnector has wrong include paths + + remove obsolete -fno-omit-frame-pointer; the bridge test has been fixed +- set Python flags using python-config instead of pkg-config on openSUSE < 11.3; + it is needed to pass configure +- updated patches to apply cleanly: + + buildfix-sdext-poppler-0.23.0.diff + + install-with-hardlinks.diff + + office-cfg-linux-common-template-dir.diff + + officecfg-help-in-usr-share.diff + + split-help-buildhack-no-vcl.diff + + split-icons-search-usr-share.diff + + system-poppler-0.12.3.diff +- update BuildRequires: + + add harfbuzz-devel which is used instead of the deprecated + ICU LayoutEngine + + enforce some system libraries versions: + + liborcus-devel >= 0.5.0 + + mdds-devel >= 0.8.0 + + remove the obsolete dependency on libzip-devel; it is correctly + required by liborcus-devel package +- temporary disable mono until the support is ported for this LO version +- try to increase the momory limits on i586 to 800; let's see if it makes + the build reliable +- update 3rd-party tarballs: + + commons-codec to 1.6: + + new Base32 encode + + various character encoding issues + + and many more fixes and improvements + + icu to 51_1 + + many fixes and improvements + + commons-lang to 2.4 + + lots bugfixes and improvements + + mdds to 0.8.1: + + added .pc file for pkg-config + + several bugfixes and improvements + + liblangtag to 0.5.1 + + several fixes and enhancements + + liborcus to 0.5.1 + + date&time related fixes and more + + libvisio to 0.0.30 + + coverity fixes + + performance improvements + + implemented B-Spline conversion for xml-based formats + + avoid NAN in NURBS code which fixes some freehand curves + + libwpg to 0.2.2 + + coverity fixes + + libwps to 0.2.9 + + read the page orientation + + improvements in table code + + various coverity and style fixes + + add support of text frames and pictures + + raptor2 to 2.0.9 + + many fixes and improvements + + rasqal to 0.9.30 + + many fixes and improvements + + redland to 1.0.16 + + many fixes and improvements +- add 3rd-party tarballs: + + libmwaw, version 0.1.10: + + allows to read many pre-OSX MAC file formats + + libodfgen, version 0.0.2 + + generate ODF documents from libwpd and libwps API calls + + harfbuzz, version 0.9.17 + + OpenType text shaping engine; used instead of the deprecated + ICU LayoutEngine +- remove obsolete patches: + + solenv-carefull-patching-hack.diff: not needed after using GNU make + + buildfix-sfx2-dependency.diff: not needed after using GNU make + + bridges-missing-cxxflags.diff: fixed better way + + build-max-64-jobs.diff: dmake is not longer used + + boost-1.53-part1.patch: upstreamed + + boost-1.53-part2.patch: upstreamed + + redland-rpath-hack.diff: it seems that it is not needed any more +- add fix-collision.patch: correctly split files into subpackages +- remove obsolte hack for the fake build time +- update configure options: + + --enable-ext-mysql-connector was renamed to --enable-ext-mariadb-connector + + fallback to the internal libraries on older distributions: + + --without-system-libmwaw on openSUSE < 13.1 + + --without-system-libodfgen on openSUSE < 13.1 + + --without-system-harfbuzz on openSUSE < 12.3 +- report builder is not longer an extension + ------------------------------------------------------------------- Fri Jul 26 10:06:40 UTC 2013 - pmladek@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index d7ac784..a478950 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -104,28 +104,29 @@ BuildRequires: junit4 BuildRequires: mono-devel %endif ############################ -# post openSUSE 12.3 features -############################ -%if 0%{?suse_version} > 01230 -# openSUSE 12.3 features +# openSUSE 13.1 features +%if 0%{?suse_version} >= 01310 BuildRequires: libcmis-devel +BuildRequires: libmwaw-devel +BuildRequires: libodfgen-devel %endif +############################ +# openSUSE 12.3 features %if 0%{?suse_version} >= 01230 BuildRequires: clucene-core-devel BuildRequires: graphite2-devel +BuildRequires: harfbuzz-devel BuildRequires: hyphen-devel BuildRequires: libcdr-devel BuildRequires: libexttextcat-devel BuildRequires: liblangtag-devel BuildRequires: libmspub-devel -BuildRequires: liborcus-devel +BuildRequires: liborcus-devel >= 0.5.0 BuildRequires: libredland-devel BuildRequires: libvisio-devel -BuildRequires: mdds-devel +BuildRequires: mdds-devel >= 0.8.0 BuildRequires: mythes-devel BuildRequires: ucpp -# FIXME: should be removed once the lixed liborcus package is in Factory -BuildRequires: libzip-devel %endif ############################ # openSUSE 11.4 features @@ -155,7 +156,7 @@ BuildRequires: python-lxml %define test_build_sdk 1 # build_mono: 1 = yes # 0 = no (pack just a README file) -%define build_mono 1 +%define build_mono 0 # save_space: 0 = no # 1 = yes (do some hacks to safe space in the installation phase) %define save_space 1 @@ -202,7 +203,7 @@ BuildRequires: python-lxml %define ct2n_version 1.3.2 %define gdocs_version 3.0.1 %define numbertext_version 0.9.5 -Version: 4.0.3.3.5 +Version: 4.1.0.4 Release: 0 Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %version @@ -532,17 +533,17 @@ Source903: lo-requires-12.1 # offical external source Source1000: ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip Source1001: 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz -Source1002: af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz +Source1002: 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz Source1003: a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Source1004: ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip Source1005: c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 -Source1006: ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz +Source1006: 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz Source1007: db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip Source1008: d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip Source1009: ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz Source1010: ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz Source1011: eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip -Source1012: fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz +Source1012: b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz Source1014: f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip Source1015: f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz Source1016: 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz @@ -551,48 +552,48 @@ Source1018: dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 Source1019: 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source1020: 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz Source1021: 185d60944ea767075d27247c3162b3bc-unowinreg.dll -Source1022: 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz +Source1022: 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz Source1023: 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz Source1024: 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -Source1025: 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz +Source1025: 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz Source1026: 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip Source1027: 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz Source1028: 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip Source1029: 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip Source1030: 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip Source1031: a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz -Source1033: 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 -Source1034: 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 +Source1033: b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 +Source1034: 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 Source1035: 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source1036: 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip Source1037: 972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2 -Source1038: d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 +Source1038: 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 Source1039: 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip Source1040: 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz Source1041: b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz -Source1042: libvisio-0.0.27.tar.bz2 -Source1043: 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 -# FIXME: the system clucene does not include stuff from contribs-lib (CJKAnalyzer.h) +Source1042: libvisio-0.0.30.tar.bz2 +Source1043: 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 Source1044: 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz -# newly developed library for LO feature Source1045: libcdr-0.0.14.tar.bz2 -# this library is not available on older distributions Source1046: 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz # internal boost headers are needed on openSUSE <= 11.3; the system one has broken dst_adjustment_offsets definition (bnc#767949) Source1047: f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 Source1048: libmspub-0.0.6.tar.bz2 -Source1049: 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 -Source1050: 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz -Source1051: fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip +Source1049: ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 +Source1050: 6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz +Source1051: 7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz +# library that allows to read many pre-OSX MAC file formats +Source1052: libmwaw-0.1.10.tar.bz2 +Source1053: 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 +Source1054: c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 +# correctly split files into subpackages +Patch1: fix-collision.patch # search application icons in /usr/share # FIXME: search both lib and lib64 and push into git Patch2: split-icons-search-usr-share.diff # search help icons in /usr/share # FIXME: make it configurable in integrate into git Patch3: officecfg-help-in-usr-share.diff -# slower patching to debug and hopefully fix parallel build of ct2n extension; always happened only in the Build Service (bnc#595550) -# FIXME: remove when scp2 module is gbuildized -Patch4: solenv-carefull-patching-hack.diff # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build # FIXME: make it configurable and push upstream @@ -602,8 +603,6 @@ Patch6: pack-desktop-files-for-optional-filters.diff # put internal rhino into XBootClasspath to fix build with OpenJDK # FIXME: make it clean to be able to push upstream Patch7: scripting-prefer-internal-rhino.diff -# svx headers started to be used in sfx2 -Patch8: buildfix-sfx2-dependency.diff # search /share/template/common for language independent templates # FIXME: make it configurable to push upstream Patch9: office-cfg-linux-common-template-dir.diff @@ -618,24 +617,14 @@ Patch13: jvmfwk-disable-gcj.diff # generate selected bytecode version also in gbuild # FIXME: push upstream and be ready to fix problem on other systems Patch14: solenv-java-source-version.diff -# lost RPM optflags when compiling bridges -Patch15: bridges-missing-cxxflags.diff -# dmake does not work with more than 64 jobs -# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed -Patch16: build-max-64-jobs.diff # Letter and Fax tamplates can't be created by python-2.6 if ODF file type description uses non-Ascii characters Patch17: wizards-create-temlates-with-python-2.6.diff -# applied in 4.0.4 and later -Patch18: boost-1.53-part1.patch -Patch19: boost-1.53-part2.patch # fix build with system poppler-0.23.0 -Patch20: buildfix-sdext-poppler-0.23.0.diff +Patch18: buildfix-sdext-poppler-0.23.0.diff # # cpp/poppler-version.h is not included in older poppler packages # FIXME: make it configurable to push upstream Patch910: system-poppler-0.12.3.diff -# crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262) -Patch920: redland-rpath-hack.diff # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # FIXME: touch --no-dereference in not available on SLED11-SP1 @@ -1307,39 +1296,29 @@ the LibreOffice localizations separately. %else %setup -q -b1 -b2 -a30 -n libreoffice-%version # apply patches before caling any other command to be able to patch with quilt easily +%patch1 -p1 %patch2 -p1 -%patch3 -%patch4 +%patch3 -p1 %patch5 %patch6 -p1 %patch7 -p1 -%patch8 -%patch9 +%patch9 -p1 %patch10 -p1 %patch11 %patch12 %patch13 -p1 %patch14 -%patch15 -%patch16 %patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 +%patch18 # %if %suse_version >= 1110 && %suse_version < 1120 # cpp/poppler-version.h is not included in older poppler packages -%patch910 -%endif -# -%if %suse_version > 1140 && %suse_version < 1230 -# crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262) -%patch920 +%patch910 -p1 %endif # %if %save_space == 1 # use hardlinks when installing files -%patch990 +%patch990 -p1 %else # FIXME: touch --no-dereference in not available on SLED11-SP1 # and it is not needed when not using harlinks @@ -1364,12 +1343,6 @@ cd - %endif %endif -# Remove build time references so build-compare can do its work -FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') -sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" solenv/src/version.c -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" solenv/src/version.c - %build %{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 @@ -1433,7 +1406,7 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" solenv/src/version.c --enable-ext-google-docs \ --enable-ext-numbertext \ --enable-ext-wiki-publisher \ - --enable-ext-mysql-connector \ + --enable-ext-mariadb-connector \ --enable-scripting-beanshell \ --enable-scripting-javascript \ --with-system-dicts \ @@ -1460,8 +1433,10 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" solenv/src/version.c %if 0%{?suse_version} >= 01230 --with-system-ucpp \ %endif -%if 0%{?suse_version} <= 01230 +%if 0%{?suse_version} < 01310 --without-system-libcmis \ + --without-system-libmwaw \ + --without-system-libodfgen \ %endif %if 0%{?suse_version} < 01230 --without-system-clucene \ @@ -1476,6 +1451,7 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" solenv/src/version.c --without-system-orcus \ --without-system-altlinuxhyph \ --without-system-mythes \ + --without-system-harfbuzz \ %endif --without-system-apache-commons \ --without-system-beanshell \ @@ -1500,14 +1476,15 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" solenv/src/version.c sed -i -e "s|@INSTALLDIR@|%lo_prefix/%lo_home|" pyuno/source/module/uno.py scripting/source/pyprov/officehelper.py # see how we stay with memory and disk space free -df +df || true cat config_host.mk # hard link binaries in the build tree; it might save several GBs on the disk and is faster # touch does not have the --no-dereference option on SLED11-SP1, so this can't be used there %if %save_space == 1 export gb_Deliver_HARDLINK=1 %endif -# FIXME: try to finish build even with potential random build crashes +# FIXME: try to survive some random build problems, e.g. not enough memory when linking +# IMPORTANT: Tomas, please try to keep this hack here or talk to me before removing it ;-) !!!! make || make || make %install @@ -2128,7 +2105,6 @@ fi %files base-extensions %defattr(-,root,root) -%lo_prefix/%lo_home/share/extensions/report-builder %if 0%{?suse_version} && 0%{?suse_version} < 01120 %lo_prefix/%lo_home/share/extensions/mysql-connector-ooo %endif diff --git a/libvisio-0.0.27.tar.bz2 b/libvisio-0.0.27.tar.bz2 deleted file mode 100644 index aca4046..0000000 --- a/libvisio-0.0.27.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff12f02c910dc65d3c435a3d25acf64ab14c74343ab7637617b2c50df626b153 -size 482514 diff --git a/libvisio-0.0.30.tar.bz2 b/libvisio-0.0.30.tar.bz2 new file mode 100644 index 0000000..a0b6327 --- /dev/null +++ b/libvisio-0.0.30.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:660f071aeef942b6a97219dae443abc23400e6ee82aa99ae3ea00c59bd6ce02c +size 486252 diff --git a/lo-provides-11.1 b/lo-provides-11.1 deleted file mode 100644 index 3f7b00f..0000000 --- a/lo-provides-11.1 +++ /dev/null @@ -1,8 +0,0 @@ -# hide some private libraries from provides -grep -v -e libmysqlcppconn.so \ - -e libicudata.so \ - -e libicui18n.so \ - -e libicule.so \ - -e libicuuc.so \ - -e liblcms2.so \ - | /usr/lib/rpm/find-provides “$@” diff --git a/lo-provides-12.1 b/lo-provides-12.1 deleted file mode 100644 index e809d6c..0000000 --- a/lo-provides-12.1 +++ /dev/null @@ -1,3 +0,0 @@ -# hide some private libraries from provides -grep -v -e libmysqlcppconn.so \ - | /usr/lib/rpm/find-provides “$@” diff --git a/lo-requires-11.1 b/lo-requires-11.1 deleted file mode 100644 index 85310a5..0000000 --- a/lo-requires-11.1 +++ /dev/null @@ -1,8 +0,0 @@ -# do not require some internal libraries -/usr/lib/rpm/find-requires “$@” | \ -grep -v -e libmysqlcppconn.so \ - -e libicudata.so \ - -e libicui18n.so \ - -e libicule.so \ - -e libicuuc.so \ - -e liblcms2.so diff --git a/lo-requires-12.1 b/lo-requires-12.1 deleted file mode 100644 index abc11a9..0000000 --- a/lo-requires-12.1 +++ /dev/null @@ -1,3 +0,0 @@ -# do not require some internal libraries -/usr/lib/rpm/find-requires “$@” | \ -grep -v -e libmysqlcppconn.so diff --git a/office-cfg-linux-common-template-dir.diff b/office-cfg-linux-common-template-dir.diff index 47bb8ed..f351f1c 100644 --- a/office-cfg-linux-common-template-dir.diff +++ b/office-cfg-linux-common-template-dir.diff @@ -1,19 +1,17 @@ -Index: officecfg/registry/data/org/openoffice/Office/Common.xcu -=================================================================== ---- officecfg/registry/data/org/openoffice/Office/Common.xcu.orig -+++ officecfg/registry/data/org/openoffice/Office/Common.xcu -@@ -727,4 +727,6 @@ - "com.sun.star.configuration.backend.GconfBackend OpenGL_Faster"/> +diff -urN libreoffice-4.1.0.0.beta1.old/officecfg/registry/data/org/openoffice/Office/Common.xcu libreoffice-4.1.0.0.beta1/officecfg/registry/data/org/openoffice/Office/Common.xcu +--- libreoffice-4.1.0.0.beta1.old/officecfg/registry/data/org/openoffice/Office/Common.xcu 2013-05-27 14:04:18.862304208 +0200 ++++ libreoffice-4.1.0.0.beta1/officecfg/registry/data/org/openoffice/Office/Common.xcu 2013-05-27 14:50:20.500303879 +0200 +@@ -699,4 +699,6 @@ + + -Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs -=================================================================== ---- officecfg/registry/schema/org/openoffice/Office/Common.xcs.orig -+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -1965,6 +1965,10 @@ +diff -urN libreoffice-4.1.0.0.beta1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs libreoffice-4.1.0.0.beta1/officecfg/registry/schema/org/openoffice/Office/Common.xcs +--- libreoffice-4.1.0.0.beta1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2013-05-27 14:04:18.859304208 +0200 ++++ libreoffice-4.1.0.0.beta1/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2013-05-27 14:50:20.501303879 +0200 +@@ -1855,6 +1855,14 @@ $(insturl)/share/template/$(vlang) $(insturl)/share/template/common @@ -21,13 +19,6 @@ Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs + file:///usr/share/templates/libreoffice/$(vlang) + file:///usr/share/templates/ooo/common + file:///usr/share/templates/ooo/$(vlang) - $(userurl)/template - - -@@ -2165,6 +2169,10 @@ - - $(insturl)/share/template/$(vlang) - $(insturl)/share/template/common + file:///usr/share/templates/libreoffice/common + file:///usr/share/templates/libreoffice/$(vlang) + file:///usr/share/templates/ooo/common diff --git a/officecfg-help-in-usr-share.diff b/officecfg-help-in-usr-share.diff index ef66108..d8e6631 100644 --- a/officecfg-help-in-usr-share.diff +++ b/officecfg-help-in-usr-share.diff @@ -1,22 +1,20 @@ -Index: officecfg/registry/data/org/openoffice/Office/Paths.xcu -=================================================================== ---- officecfg/registry/data/org/openoffice/Office/Paths.xcu.orig -+++ officecfg/registry/data/org/openoffice/Office/Paths.xcu -@@ -120,7 +120,7 @@ - - - -- -+ - - - -Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs -=================================================================== ---- officecfg/registry/schema/org/openoffice/Office/Common.xcs.orig -+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -1913,7 +1913,7 @@ - ABI +diff -urN libreoffice-4.1.0.0.beta1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu libreoffice-4.1.0.0.beta1/officecfg/registry/data/org/openoffice/Office/Paths.xcu +--- libreoffice-4.1.0.0.beta1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu 2013-05-27 14:04:18.862304208 +0200 ++++ libreoffice-4.1.0.0.beta1/officecfg/registry/data/org/openoffice/Office/Paths.xcu 2013-05-27 14:38:16.224303965 +0200 +@@ -98,7 +98,7 @@ + + + +- ++ + + + +diff -urN libreoffice-4.1.0.0.beta1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs libreoffice-4.1.0.0.beta1/officecfg/registry/schema/org/openoffice/Office/Common.xcs +--- libreoffice-4.1.0.0.beta1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2013-05-27 14:04:18.859304208 +0200 ++++ libreoffice-4.1.0.0.beta1/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2013-05-27 14:37:02.371303974 +0200 +@@ -1613,7 +1613,7 @@ + Specifies the path to the Office help files. - $(instpath)/help @@ -24,7 +22,7 @@ Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -2126,7 +2126,7 @@ +@@ -1808,7 +1808,7 @@ Specifies the default directory where Office help files are located. diff --git a/redland-rpath-hack.diff b/redland-rpath-hack.diff deleted file mode 100644 index 605b562..0000000 --- a/redland-rpath-hack.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- redland/raptor/makefile.mk.old 2012-02-24 16:34:51.000000000 +0100 -+++ redland/raptor/makefile.mk 2012-03-01 17:06:53.000000000 +0100 -@@ -162,7 +162,7 @@ CONFIGURE_FLAGS+=--with-xslt-config=$(SO - .IF "$(CROSS_COMPILING)"=="YES" - CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) - .ENDIF --BUILD_ACTION=$(GNUMAKE) -+BUILD_ACTION=sed -i -e "s|\(sys_lib_dlsearch_path_spec=\"\)|\1/usr/lib64 |" libtool && $(GNUMAKE) - BUILD_FLAGS+= -j$(EXTMAXPROCESS) - BUILD_DIR=$(CONFIGURE_DIR) - .ENDIF diff --git a/solenv-carefull-patching-hack.diff b/solenv-carefull-patching-hack.diff deleted file mode 100644 index 5f49f33..0000000 --- a/solenv-carefull-patching-hack.diff +++ /dev/null @@ -1,25 +0,0 @@ -Index: solenv/inc/tg_ext.mk -=================================================================== ---- solenv/inc/tg_ext.mk.orig -+++ solenv/inc/tg_ext.mk -@@ -199,12 +199,18 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PA - @echo no patch needed... - $(COMMAND_ECHO)$(TOUCH) $@ - .ELSE # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" -+ @echo patches available... - .IF "$(GUI_FOR_BUILD)"=="WNT" -- $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) -+ $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && echo "patches applied..." -+ $(DELAY) 2 -+ $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" -- $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) -+ $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && echo "patches applied..." -+ $(DELAY) 2 -+ $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TOUCH) $(PATCH_FLAG_FILE) - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" -+ @echo patching finished... - .IF "$(T_ADDITIONAL_FILES)"!="" - .IF "$(GUI_FOR_BUILD)"=="WNT" - # Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds diff --git a/split-help-buildhack-no-vcl.diff b/split-help-buildhack-no-vcl.diff index a694604..d1b00d0 100644 --- a/split-help-buildhack-no-vcl.diff +++ b/split-help-buildhack-no-vcl.diff @@ -1,17 +1,11 @@ ---- xmlhelp/prj/build.lst.old 2013-04-16 18:12:49.000000000 +0200 -+++ xmlhelp/prj/build.lst 2013-04-16 18:18:33.000000000 +0200 -@@ -1,3 +1,3 @@ --xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools vcl NULL -+xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools NULL - xh xmlhelp usr1 - all xh_mkout NULL - xh xmlhelp\prj nmake - all xh_prj NULL ---- xmlhelp/Module_xmlhelp.mk.old 2013-04-16 09:46:01.000000000 +0200 -+++ xmlhelp/Module_xmlhelp.mk 2013-04-16 18:12:00.000000000 +0200 -@@ -29,7 +29,6 @@ $(eval $(call gb_Module_Module,xmlhelp)) +diff -urN libreoffice-4.1.0.0.beta1.old/xmlhelp/Module_xmlhelp.mk libreoffice-4.1.0.0.beta1/xmlhelp/Module_xmlhelp.mk +--- libreoffice-4.1.0.0.beta1.old/xmlhelp/Module_xmlhelp.mk 2013-05-27 14:04:24.362304207 +0200 ++++ libreoffice-4.1.0.0.beta1/xmlhelp/Module_xmlhelp.mk 2013-05-28 12:25:13.561294608 +0200 +@@ -11,7 +11,6 @@ $(eval $(call gb_Module_add_targets,xmlhelp,\ Library_tvhlp1 \ - Library_ucpchelp1 \ Package_xsl \ - Zip_helpxsl \ + Package_helpxsl \ )) diff --git a/split-icons-search-usr-share.diff b/split-icons-search-usr-share.diff index 418adf7..31cda5b 100644 --- a/split-icons-search-usr-share.diff +++ b/split-icons-search-usr-share.diff @@ -1,29 +1,29 @@ -diff -urN libreoffice-4.0.0.0.beta1.old/vcl/inc/impimagetree.hxx libreoffice-4.0.0.0.beta1/vcl/inc/impimagetree.hxx ---- libreoffice-4.0.0.0.beta1.old/vcl/inc/impimagetree.hxx 2012-12-17 12:47:09.692137928 +0100 -+++ libreoffice-4.0.0.0.beta1/vcl/inc/impimagetree.hxx 2012-12-17 12:48:30.214130463 +0100 +diff -urN libreoffice-4.1.0.0.beta1.old/vcl/inc/impimagetree.hxx libreoffice-4.1.0.0.beta1/vcl/inc/impimagetree.hxx +--- libreoffice-4.1.0.0.beta1.old/vcl/inc/impimagetree.hxx 2013-05-27 14:04:19.777304208 +0200 ++++ libreoffice-4.1.0.0.beta1/vcl/inc/impimagetree.hxx 2013-05-27 14:14:07.409304138 +0200 @@ -76,6 +76,10 @@ typedef boost::unordered_map< - rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache; + OUString, std::pair< bool, BitmapEx >, OUStringHash > IconCache; + // we want to search zip files (icons) also in /usr/share/ -+ ::rtl::OUString m_datadir; // /usr/share/ ++ ::rtl::OUString m_datadir; // /usr/share/ + ::rtl::OUString m_libdir; // /usr/lib or /usr/lib64 -+ - rtl::OUString m_style; ++ + OUString m_style; Paths m_paths; CheckStyleCache m_checkStyleCache; @@ -84,6 +88,7 @@ - void setStyle(rtl::OUString const & style ); + void setStyle(OUString const & style ); + void addUrlToPaths(const rtl::OUString &url); void resetPaths(); - bool checkStyleCacheLookup( rtl::OUString const & style, bool &exists ); -diff -urN libreoffice-4.0.0.0.beta1.old/vcl/source/gdi/impimagetree.cxx libreoffice-4.0.0.0.beta1/vcl/source/gdi/impimagetree.cxx ---- libreoffice-4.0.0.0.beta1.old/vcl/source/gdi/impimagetree.cxx 2012-12-17 12:47:09.685137929 +0100 -+++ libreoffice-4.0.0.0.beta1/vcl/source/gdi/impimagetree.cxx 2012-12-17 12:48:30.214130463 +0100 -@@ -146,7 +146,16 @@ + bool checkStyleCacheLookup( OUString const & style, bool &exists ); +diff -urN libreoffice-4.1.0.0.beta1.old/vcl/source/gdi/impimagetree.cxx libreoffice-4.1.0.0.beta1/vcl/source/gdi/impimagetree.cxx +--- libreoffice-4.1.0.0.beta1.old/vcl/source/gdi/impimagetree.cxx 2013-05-27 14:04:19.749304208 +0200 ++++ libreoffice-4.1.0.0.beta1/vcl/source/gdi/impimagetree.cxx 2013-05-27 14:21:57.167304082 +0200 +@@ -128,7 +128,16 @@ } @@ -41,7 +41,7 @@ diff -urN libreoffice-4.0.0.0.beta1.old/vcl/source/gdi/impimagetree.cxx libreoff ImplImageTree::~ImplImageTree() {} -@@ -288,6 +297,22 @@ +@@ -253,6 +262,22 @@ } } @@ -63,75 +63,33 @@ diff -urN libreoffice-4.0.0.0.beta1.old/vcl/source/gdi/impimagetree.cxx libreoff + void ImplImageTree::resetPaths() { m_paths.clear(); - { -@@ -296,10 +321,7 @@ - rtl::Bootstrap::expandMacros(url); - INetURLObject u(url); - OSL_ASSERT(!u.HasError()); -- m_paths.push_back( -- std::make_pair( -- u.GetMainURL(INetURLObject::NO_DECODE), -- css::uno::Reference< css::container::XNameAccess >())); -+ addUrlToPaths(u.GetMainURL(INetURLObject::NO_DECODE)); - } - { - rtl::OUString url( -@@ -313,17 +335,12 @@ - b.appendAscii(RTL_CONSTASCII_STRINGPARAM("_brand")); - bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL); - OSL_ASSERT(ok); (void) ok; -- m_paths.push_back( -- std::make_pair( -- u.GetMainURL(INetURLObject::NO_DECODE), -- css::uno::Reference< css::container::XNameAccess >())); -+ addUrlToPaths(u.GetMainURL(INetURLObject::NO_DECODE)); - } - { - rtl::OUString url( "$BRAND_BASE_DIR/share/config/images_brand"); - rtl::Bootstrap::expandMacros(url); -- m_paths.push_back( -- std::make_pair( -- url, css::uno::Reference< css::container::XNameAccess >())); -+ addUrlToPaths(url); - } - { - rtl::OUString url( -@@ -336,18 +353,13 @@ - b.append(m_style); - bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL); - OSL_ASSERT(ok); (void) ok; -- m_paths.push_back( -- std::make_pair( -- u.GetMainURL(INetURLObject::NO_DECODE), -- css::uno::Reference< css::container::XNameAccess >())); -+ addUrlToPaths(u.GetMainURL(INetURLObject::NO_DECODE)); - } - if ( m_style == "default" ) - { - rtl::OUString url( "$BRAND_BASE_DIR/share/config/images"); - rtl::Bootstrap::expandMacros(url); -- m_paths.push_back( -- std::make_pair( -- url, css::uno::Reference< css::container::XNameAccess >())); -+ addUrlToPaths(url); + +@@ -268,9 +293,7 @@ } + else + url += "images"; +- m_paths.push_back( +- std::make_pair( +- url, css::uno::Reference< css::container::XNameAccess >())); ++ addUrlToPaths(url); } -diff -urN libreoffice-4.0.0.0.beta1.old/xmlhelp/source/cxxhelp/provider/provider.cxx libreoffice-4.0.0.0.beta1/xmlhelp/source/cxxhelp/provider/provider.cxx ---- libreoffice-4.0.0.0.beta1.old/xmlhelp/source/cxxhelp/provider/provider.cxx 2012-12-17 12:47:12.392137678 +0100 -+++ libreoffice-4.0.0.0.beta1/xmlhelp/source/cxxhelp/provider/provider.cxx 2012-12-17 12:48:30.214130463 +0100 -@@ -326,7 +326,7 @@ - rtl::OUString( " " ) + + bool ImplImageTree::checkStyleCacheLookup( +diff -urN libreoffice-4.1.0.0.beta1.old/xmlhelp/source/cxxhelp/provider/provider.cxx libreoffice-4.1.0.0.beta1/xmlhelp/source/cxxhelp/provider/provider.cxx +--- libreoffice-4.1.0.0.beta1.old/xmlhelp/source/cxxhelp/provider/provider.cxx 2013-05-27 14:04:24.361304207 +0200 ++++ libreoffice-4.1.0.0.beta1/xmlhelp/source/cxxhelp/provider/provider.cxx 2013-05-27 14:17:37.465304113 +0200 +@@ -321,7 +321,7 @@ + OUString( " " ) + setupextension ); -- uno::Sequence< rtl::OUString > aImagesZipPaths( 2 ); -+ uno::Sequence< rtl::OUString > aImagesZipPaths( 3 ); +- uno::Sequence< OUString > aImagesZipPaths( 2 ); ++ uno::Sequence< OUString > aImagesZipPaths( 3 ); xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" ); - rtl::OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) ); -@@ -335,6 +335,19 @@ + OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) ); +@@ -330,6 +330,19 @@ - aPath = rtl::OUString("$BRAND_BASE_DIR/share/config"); + aPath = OUString("$BRAND_BASE_DIR/share/config"); rtl::Bootstrap::expandMacros(aPath); + aImagesZipPaths[ 2 ] = aPath; + diff --git a/system-poppler-0.12.3.diff b/system-poppler-0.12.3.diff index 7b1135e..8813ff6 100644 --- a/system-poppler-0.12.3.diff +++ b/system-poppler-0.12.3.diff @@ -1,8 +1,7 @@ -Index: libreoffice-4.0.3.2a/configure.ac -=================================================================== ---- configure.ac -+++ configure.ac -@@ -9723,16 +9723,6 @@ if test "$_os" != Android -a "$_os" != i +diff -urN libreoffice-4.1.0.0.beta1.old/configure.ac libreoffice-4.1.0.0.beta1/configure.ac +--- libreoffice-4.1.0.0.beta1.old/configure.ac 2013-05-27 14:04:19.684304208 +0200 ++++ libreoffice-4.1.0.0.beta1/configure.ac 2013-05-29 12:27:28.212284282 +0200 +@@ -9658,16 +9658,6 @@ AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) @@ -16,12 +15,13 @@ Index: libreoffice-4.0.3.2a/configure.ac - CXXFLAGS=$save_CXXFLAGS - CPPFLAGS=$save_CPPFLAGS - AC_LANG_POP([C++]) - libo_MINGW_CHECK_DLL([POPPLER], [libpoppler]) + libo_MINGW_CHECK_DLL([libpoppler]) else AC_MSG_RESULT([internal]) ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.old 2013-05-01 16:10:03.000000000 +0200 -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2013-05-01 16:11:22.000000000 +0200 -@@ -62,7 +62,10 @@ class PDFDoc; +diff -urN libreoffice-4.1.0.0.beta1.old/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx libreoffice-4.1.0.0.beta1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +--- libreoffice-4.1.0.0.beta1.old/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2013-05-27 14:04:19.863304208 +0200 ++++ libreoffice-4.1.0.0.beta1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2013-05-29 12:25:26.574284296 +0200 +@@ -58,7 +58,10 @@ #define POPPLER_CHECK_VERSION(major,minor,micro) (0) typedef GString GooString; #else