From 1038787bac35153ef12c2faa89f32bb27926905114560687b265261c0a56ea0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 3 Dec 2016 11:51:43 +0000 Subject: [PATCH 01/23] - Version update to 5.2.4.1 * various bugfixes mostly containing L3 fixes: - Fix L3 bnc#946674 LO-L3: Undo does not revert bundled font size changes for table cells - Fix L3 bnc#952640 LO-L3: Cut and Paste (at the same position) changes bullet point formatting - Fix L3 bnc#955548 LO-L3: CTRL+Z not working to undo changes performed through Navigator - Fix L3 bnc#959168 LO-L3: Undo on bullet point style change only works when focus is not set - bnc#957991 LO-L3: Improve pivot cache reading performance OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=445 --- libreoffice-5.2.3.3.tar.xz | 3 --- libreoffice-5.2.4.1.tar.xz | 3 +++ libreoffice-help-5.2.3.3.tar.xz | 3 --- libreoffice-help-5.2.4.1.tar.xz | 3 +++ libreoffice-translations-5.2.3.3.tar.xz | 3 --- libreoffice-translations-5.2.4.1.tar.xz | 3 +++ libreoffice.changes | 15 +++++++++++++++ libreoffice.spec | 4 ++-- 8 files changed, 26 insertions(+), 11 deletions(-) delete mode 100644 libreoffice-5.2.3.3.tar.xz create mode 100644 libreoffice-5.2.4.1.tar.xz delete mode 100644 libreoffice-help-5.2.3.3.tar.xz create mode 100644 libreoffice-help-5.2.4.1.tar.xz delete mode 100644 libreoffice-translations-5.2.3.3.tar.xz create mode 100644 libreoffice-translations-5.2.4.1.tar.xz diff --git a/libreoffice-5.2.3.3.tar.xz b/libreoffice-5.2.3.3.tar.xz deleted file mode 100644 index 69a5e12..0000000 --- a/libreoffice-5.2.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 -size 183870036 diff --git a/libreoffice-5.2.4.1.tar.xz b/libreoffice-5.2.4.1.tar.xz new file mode 100644 index 0000000..70badb0 --- /dev/null +++ b/libreoffice-5.2.4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd9cbfe104fad656f7f64fa97f114efd6589b6d39cbb2902bd119dd4f536385b +size 184146468 diff --git a/libreoffice-help-5.2.3.3.tar.xz b/libreoffice-help-5.2.3.3.tar.xz deleted file mode 100644 index 5f97c20..0000000 --- a/libreoffice-help-5.2.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a -size 1936920 diff --git a/libreoffice-help-5.2.4.1.tar.xz b/libreoffice-help-5.2.4.1.tar.xz new file mode 100644 index 0000000..69e0b54 --- /dev/null +++ b/libreoffice-help-5.2.4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23a71c9e8044996a07137a89592021e9f9de712a249ae0b9362e9895df92aa26 +size 1936996 diff --git a/libreoffice-translations-5.2.3.3.tar.xz b/libreoffice-translations-5.2.3.3.tar.xz deleted file mode 100644 index ceadafb..0000000 --- a/libreoffice-translations-5.2.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8401e51c4b91cd47f103ba09519f0b5b9213561b7d6296ff5bdc2d1622950a48 -size 141771228 diff --git a/libreoffice-translations-5.2.4.1.tar.xz b/libreoffice-translations-5.2.4.1.tar.xz new file mode 100644 index 0000000..2716a85 --- /dev/null +++ b/libreoffice-translations-5.2.4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41b2df9f25d7b436b8d71968addc9235d8ee16e3dddda52b8c60874f59b4bf4e +size 141521800 diff --git a/libreoffice.changes b/libreoffice.changes index dbf5b34..74e7a97 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com + +- Version update to 5.2.4.1 + * various bugfixes mostly containing L3 fixes: +- Fix L3 bnc#946674 LO-L3: Undo does not revert bundled font size changes for + table cells +- Fix L3 bnc#952640 LO-L3: Cut and Paste (at the same position) changes bullet + point formatting +- Fix L3 bnc#955548 LO-L3: CTRL+Z not working to undo changes performed through + Navigator +- Fix L3 bnc#959168 LO-L3: Undo on bullet point style change only works when + focus is not set +- bnc#957991 LO-L3: Improve pivot cache reading performance + ------------------------------------------------------------------- Mon Nov 21 07:56:22 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 0192288..3592d8a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -22,7 +22,7 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.3 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.4 # Wether to enable the kde integration %if 0%{?is_opensuse} || %{suse_version} == 1320 %bcond_without kdeintegration @@ -30,7 +30,7 @@ %bcond_with kdeintegration %endif Name: libreoffice -Version: 5.2.3.3 +Version: 5.2.4.1 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C From 4cae7aabcca96bd04718f43d26d6164ab271cd043d800d0b5020add8fef55ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 3 Dec 2016 12:09:04 +0000 Subject: [PATCH 02/23] - Refresh patch libreoffice-hotfix-disablebrokenshapetest.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=446 --- libreoffice-hotfix-disablebrokenshapetest.patch | 14 +++++++------- libreoffice.changes | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libreoffice-hotfix-disablebrokenshapetest.patch b/libreoffice-hotfix-disablebrokenshapetest.patch index 721e8cb..aa11f50 100644 --- a/libreoffice-hotfix-disablebrokenshapetest.patch +++ b/libreoffice-hotfix-disablebrokenshapetest.patch @@ -1,8 +1,8 @@ -Index: libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +Index: libreoffice-5.2.4.1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx =================================================================== ---- libreoffice-5.2.0.0.alpha1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -+++ libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -@@ -1103,29 +1103,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, " +--- libreoffice-5.2.4.1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ++++ libreoffice-5.2.4.1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +@@ -1114,29 +1114,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, " assertXPath(pXmlDoc, "//w:ind", "start", "1418"); } @@ -29,6 +29,6 @@ Index: libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -#endif -} - - #endif - - CPPUNIT_PLUGIN_IMPLEMENT(); + DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx") + { + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); diff --git a/libreoffice.changes b/libreoffice.changes index 74e7a97..b1c22e7 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -12,6 +12,7 @@ Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com - Fix L3 bnc#959168 LO-L3: Undo on bullet point style change only works when focus is not set - bnc#957991 LO-L3: Improve pivot cache reading performance +- Refresh patch libreoffice-hotfix-disablebrokenshapetest.patch ------------------------------------------------------------------- Mon Nov 21 07:56:22 UTC 2016 - tchvatal@suse.com From 991c27771004d9e8e368c6d66052dd64f2060c6e4c25bfd4c12846b9bd10d8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 3 Dec 2016 12:17:29 +0000 Subject: [PATCH 03/23] - Version update to 5.3.0.beta1: * Starting of testing of new major release OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=447 --- libreoffice-5.2.4.1.tar.xz | 3 --- libreoffice-5.3.0.0.beta1.tar.xz | 3 +++ libreoffice-help-5.2.4.1.tar.xz | 3 --- libreoffice-help-5.3.0.0.beta1.tar.xz | 3 +++ libreoffice-translations-5.2.4.1.tar.xz | 3 --- libreoffice-translations-5.3.0.0.beta1.tar.xz | 3 +++ libreoffice.changes | 6 ++++++ libreoffice.spec | 4 ++-- 8 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 libreoffice-5.2.4.1.tar.xz create mode 100644 libreoffice-5.3.0.0.beta1.tar.xz delete mode 100644 libreoffice-help-5.2.4.1.tar.xz create mode 100644 libreoffice-help-5.3.0.0.beta1.tar.xz delete mode 100644 libreoffice-translations-5.2.4.1.tar.xz create mode 100644 libreoffice-translations-5.3.0.0.beta1.tar.xz diff --git a/libreoffice-5.2.4.1.tar.xz b/libreoffice-5.2.4.1.tar.xz deleted file mode 100644 index 70badb0..0000000 --- a/libreoffice-5.2.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd9cbfe104fad656f7f64fa97f114efd6589b6d39cbb2902bd119dd4f536385b -size 184146468 diff --git a/libreoffice-5.3.0.0.beta1.tar.xz b/libreoffice-5.3.0.0.beta1.tar.xz new file mode 100644 index 0000000..1038c17 --- /dev/null +++ b/libreoffice-5.3.0.0.beta1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8384876bf214195e4e35c4c1f6f7365e0178eef44111815a4c6dc5050ee931a5 +size 187854296 diff --git a/libreoffice-help-5.2.4.1.tar.xz b/libreoffice-help-5.2.4.1.tar.xz deleted file mode 100644 index 69e0b54..0000000 --- a/libreoffice-help-5.2.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23a71c9e8044996a07137a89592021e9f9de712a249ae0b9362e9895df92aa26 -size 1936996 diff --git a/libreoffice-help-5.3.0.0.beta1.tar.xz b/libreoffice-help-5.3.0.0.beta1.tar.xz new file mode 100644 index 0000000..d883d21 --- /dev/null +++ b/libreoffice-help-5.3.0.0.beta1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b962a9d4fd7a0d1abafb2e4d9bbdd19ee635ad7a7b64fb84ad796229d45e6d7 +size 2119464 diff --git a/libreoffice-translations-5.2.4.1.tar.xz b/libreoffice-translations-5.2.4.1.tar.xz deleted file mode 100644 index 2716a85..0000000 --- a/libreoffice-translations-5.2.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41b2df9f25d7b436b8d71968addc9235d8ee16e3dddda52b8c60874f59b4bf4e -size 141521800 diff --git a/libreoffice-translations-5.3.0.0.beta1.tar.xz b/libreoffice-translations-5.3.0.0.beta1.tar.xz new file mode 100644 index 0000000..70898f7 --- /dev/null +++ b/libreoffice-translations-5.3.0.0.beta1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7c4426c223c2215b0b26b0b789b98287de28b606271e2fc8767d13a97058fa7 +size 140756124 diff --git a/libreoffice.changes b/libreoffice.changes index b1c22e7..6923563 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 3 12:15:27 UTC 2016 - tchvatal@suse.com + +- Version update to 5.3.0.beta1: + * Starting of testing of new major release + ------------------------------------------------------------------- Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 3592d8a..8afc5aa 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -22,7 +22,7 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.4 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.3.0 # Wether to enable the kde integration %if 0%{?is_opensuse} || %{suse_version} == 1320 %bcond_without kdeintegration @@ -30,7 +30,7 @@ %bcond_with kdeintegration %endif Name: libreoffice -Version: 5.2.4.1 +Version: 5.3.0.0.beta1 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C From e37075d005c3c1481f2ddc7368a21fafa8359f16c310961a8e64df37c9d221f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 3 Dec 2016 12:23:39 +0000 Subject: [PATCH 04/23] - Refresh patch system-pyuno.diff OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=448 --- libreoffice.changes | 2 +- system-pyuno.diff | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 6923563..96988ea 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -3,7 +3,7 @@ Sat Dec 3 12:15:27 UTC 2016 - tchvatal@suse.com - Version update to 5.3.0.beta1: * Starting of testing of new major release - +- Refresh patch system-pyuno.diff ------------------------------------------------------------------- Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com diff --git a/system-pyuno.diff b/system-pyuno.diff index 10f03fd..d5354cd 100644 --- a/system-pyuno.diff +++ b/system-pyuno.diff @@ -1,7 +1,7 @@ -Index: libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh +Index: libreoffice-5.3.0.0.beta1/desktop/scripts/soffice.sh =================================================================== ---- libreoffice-5.2.0.0.alpha1.orig/desktop/scripts/soffice.sh -+++ libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh +--- libreoffice-5.3.0.0.beta1.orig/desktop/scripts/soffice.sh ++++ libreoffice-5.3.0.0.beta1/desktop/scripts/soffice.sh @@ -137,6 +137,9 @@ if echo "$checks" | grep -q "cc" ; then exit 1; fi @@ -12,28 +12,26 @@ Index: libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh case "`uname -s`" in NetBSD|OpenBSD|DragonFly) # this is a temporary hack until we can live with the default search paths -Index: libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py +Index: libreoffice-5.3.0.0.beta1/pyuno/source/module/uno.py =================================================================== ---- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/module/uno.py -+++ libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py -@@ -16,8 +16,12 @@ +--- libreoffice-5.3.0.0.beta1.orig/pyuno/source/module/uno.py ++++ libreoffice-5.3.0.0.beta1/pyuno/source/module/uno.py +@@ -16,6 +16,10 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +import os - import sys - +sys.path.append('@INSTALLDIR@/program') +if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: + os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc" import pyuno - - try: -Index: libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py + import sys + import traceback +Index: libreoffice-5.3.0.0.beta1/pyuno/source/officehelper.py =================================================================== ---- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/officehelper.py -+++ libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py -@@ -44,7 +44,7 @@ def bootstrap(): +--- libreoffice-5.3.0.0.beta1.orig/pyuno/source/officehelper.py ++++ libreoffice-5.3.0.0.beta1/pyuno/source/officehelper.py +@@ -45,7 +45,7 @@ def bootstrap(): if "UNO_PATH" in os.environ: sOffice = os.environ["UNO_PATH"] else: From f0c3e55f62108ad88232cb042363103bc99d169389bbc378fe66e8cb2b5cd507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 3 Dec 2016 12:33:57 +0000 Subject: [PATCH 05/23] - Refresh again libreoffice-hotfix-disablebrokenshapetest.patch - Drop upstreamed patches: * libreoffice-firebird3-selftest.patch * libreoffice-firebird3.patch * 0001-allow-none-gi-support.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=449 --- .gitattributes | 1 - 0001-allow-none-gi-support.patch | 59 --------- firebird_integer_x64le_ods12.odb | 3 - libreoffice-firebird3-selftest.patch | 119 ------------------ libreoffice-firebird3.patch | 65 ---------- ...office-hotfix-disablebrokenshapetest.patch | 14 +-- libreoffice.changes | 6 + libreoffice.spec | 11 -- 8 files changed, 13 insertions(+), 265 deletions(-) delete mode 100644 0001-allow-none-gi-support.patch delete mode 100644 firebird_integer_x64le_ods12.odb delete mode 100644 libreoffice-firebird3-selftest.patch delete mode 100644 libreoffice-firebird3.patch diff --git a/.gitattributes b/.gitattributes index a67b740..ad0e1bf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,4 +23,3 @@ *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns 185d60944ea767075d27247c3162b3bc-unowinreg.dll filter=lfs diff=lfs merge=lfs -text -firebird_integer_x64le_ods12.odb filter=lfs diff=lfs merge=lfs -text diff --git a/0001-allow-none-gi-support.patch b/0001-allow-none-gi-support.patch deleted file mode 100644 index b23513d..0000000 --- a/0001-allow-none-gi-support.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 84bfe584e4bd03a7b6e2c1e68c65bf99ae83c839 Mon Sep 17 00:00:00 2001 -From: Pranav Kant -Date: Tue, 18 Oct 2016 17:27:00 +0530 -Subject: tdf#102511: Add (allow-none) for backward GI compatibility - -(allow-none), though deprecated since GI 1.42, is required to -maintain the backward compatibility since (nullable), added in -GI 1.42, is not understood by GI tools < 1.42 preventing the -clients from passing a null parameter to various functions in the -widget. - -We can remove this deprecated (allow-none) annotation once we -bump the GI version in LibreOffice to atleast 1.42 - -Change-Id: I98a1f3d2205ec5afd8060f16e69c5f938f229e26 - -Index: libreoffice-5.2.3.2/include/LibreOfficeKit/LibreOfficeKitGtk.h -=================================================================== ---- libreoffice-5.2.3.2.orig/include/LibreOfficeKit/LibreOfficeKitGtk.h -+++ libreoffice-5.2.3.2/include/LibreOfficeKit/LibreOfficeKitGtk.h -@@ -42,7 +42,7 @@ GType lok_doc_v - - /** - * lok_doc_view_new: -- * @pPath: (nullable): LibreOffice install path. Pass null to set it to default -+ * @pPath: (nullable): (allow-none): LibreOffice install path. Pass null to set it to default - * path which in most cases would be $libdir/libreoffice/program - * @cancellable: The cancellable object that you can use to cancel this - * operation. -@@ -56,9 +56,9 @@ GtkWidget* lok_doc_v - - /** - * lok_doc_view_new_from_user_profile: -- * @pPath: (nullable): LibreOffice install path. Pass null to set it to default -+ * @pPath: (nullable): (allow-none): LibreOffice install path. Pass null to set it to default - * path which in most cases would be $libdir/libreoffice/program -- * @pUserProfile: (nullable): User profile URL. Must be either a file URL or a -+ * @pUserProfile: (nullable): (allow-none): User profile URL. Must be either a file URL or a - * special vnd.sun.star.pathname URL. Pass non-null to be able to use this - * widget and LibreOffice itself in parallel. - * @cancellable: The cancellable object that you can use to cancel this -@@ -84,7 +84,7 @@ GtkWidget* lok_doc_v - * lok_doc_view_open_document: - * @pDocView: The #LOKDocView instance - * @pPath: (transfer full): The path of the document that #LOKDocView widget should try to open -- * @pRenderingArguments: (nullable): lok::Document::initializeForRendering() arguments. -+ * @pRenderingArguments: (nullable): (allow-none): lok::Document::initializeForRendering() arguments. - * @cancellable: - * @callback: - * @userdata: -@@ -307,7 +307,7 @@ gboolean lok_doc_ - * lok_doc_view_set_document_password: - * @pDocView: The #LOKDocView instance - * @pUrl: the URL of the document to set password for, as sent with signal `password-required` -- * @pPassword: (nullable): the password, NULL for no password -+ * @pPassword: (nullable): (allow-none): the password, NULL for no password - * - * Set the password for password protected documents - */ diff --git a/firebird_integer_x64le_ods12.odb b/firebird_integer_x64le_ods12.odb deleted file mode 100644 index 234acd8..0000000 --- a/firebird_integer_x64le_ods12.odb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38e8bfbf16aef63ea9438f937138ec03d409b2f47fcc1605fd868a2d7ba12c17 -size 75701 diff --git a/libreoffice-firebird3-selftest.patch b/libreoffice-firebird3-selftest.patch deleted file mode 100644 index ab0f78e..0000000 --- a/libreoffice-firebird3-selftest.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Michal Kubecek -Date: Thu, 2 Jun 2016 11:56:10 +0200 -Subject: connectivity: firebird: use ODS12 test database for Firebird 3 -Patch-mainline: Not tagged yet (5.3.0.0.alpha1?) -Git-commit: de899f0b350e51b1932fa4674f7ce2ae386cd1ce -References: bsc#982485 - -Firebird 3.0 uses new database file format (ODS, On Disk Structure) so -that we need to use either ODS11 or ODS12 version of test database for -dbaccess_firebird test, depending on whether building against Firebird -2.5 or 3.0 libraries. - -Change-Id: Idecdc35b0ac87ab7f46cb79b5c044c65423a2c7e -Reviewed-on: https://gerrit.libreoffice.org/25846 -Reviewed-by: jan iversen -Tested-by: jan iversen ---- - config_host/config_firebird.h.in | 10 ++++++++++ - configure.ac | 16 +++++++++++++--- - dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb | Bin 0 -> 75701 bytes - dbaccess/qa/unit/firebird.cxx | 5 +++++ - 4 files changed, 28 insertions(+), 3 deletions(-) - create mode 100644 config_host/config_firebird.h.in - create mode 100644 dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb - -diff --git a/config_host/config_firebird.h.in b/config_host/config_firebird.h.in -new file mode 100644 -index 000000000000..c6aa43ac54f3 ---- /dev/null -+++ b/config_host/config_firebird.h.in -@@ -0,0 +1,10 @@ -+/* -+Settings for Firebird -+*/ -+ -+#ifndef CONFIG_FIREBIRD_H -+#define CONFIG_FIREBIRD_H -+ -+#define HAVE_FIREBIRD_30 0 -+ -+#endif -diff --git a/configure.ac b/configure.ac -index 6abeae315c2e..1d137c6a129c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8671,8 +8671,10 @@ if test "$enable_firebird_sdbc" = "yes" ; then - if test -n "${FIREBIRD_VERSION}"; then - FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1` - FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2` -- if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5" -o \ -- "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then -+ if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5"; then -+ AC_MSG_RESULT([OK]) -+ elif test "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then -+ AC_DEFINE(HAVE_FIREBIRD_30, 1) - AC_MSG_RESULT([OK]) - else - AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed]) -@@ -8681,10 +8683,16 @@ if test "$enable_firebird_sdbc" = "yes" ; then - __save_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} ${FIREBIRD_CFLAGS}" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include --#if defined(FB_API_VER) && (FB_API_VER == 25 || FB_API_VER == 30) -+#if defined(FB_API_VER) && FB_API_VER == 25 -+int fb_api_is_25(void) { return 0; } -+#elif defined(FB_API_VER) && FB_API_VER == 30 -+int fb_api_is_30(void) { return 0; } - #else - #error "Wrong Firebird API version" - #endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed])) -+ if nm conftest.$OBJEXT | grep fb_api_is_30; then -+ AC_DEFINE(HAVE_FIREBIRD_30, 1) -+ fi - CFLAGS="${__save_CFLAGS}" - fi - ENABLE_FIREBIRD_SDBC="TRUE" -@@ -8727,6 +8735,7 @@ AC_SUBST(LIBATOMIC_OPS_LIBS) - AC_SUBST(SYSTEM_FIREBIRD) - AC_SUBST(FIREBIRD_CFLAGS) - AC_SUBST(FIREBIRD_LIBS) -+AC_SUBST(HAVE_FIREBIRD_30) - dnl AC_SUBST([TOMMATH_CFLAGS]) - dnl AC_SUBST([TOMMATH_LIBS]) - -@@ -12928,6 +12937,7 @@ AC_CONFIG_HEADERS([config_host/config_cairo_canvas.h]) - AC_CONFIG_HEADERS([config_host/config_cxxabi.h]) - AC_CONFIG_HEADERS([config_host/config_dbus.h]) - AC_CONFIG_HEADERS([config_host/config_features.h]) -+AC_CONFIG_HEADERS([config_host/config_firebird.h]) - AC_CONFIG_HEADERS([config_host/config_folders.h]) - AC_CONFIG_HEADERS([config_host/config_gio.h]) - AC_CONFIG_HEADERS([config_host/config_global.h]) -diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx -index c9ee575f9b7f..da0bed760d2e 100644 ---- a/dbaccess/qa/unit/firebird.cxx -+++ b/dbaccess/qa/unit/firebird.cxx -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - using namespace ::com::sun::star; - using namespace ::com::sun::star::sdb; -@@ -65,7 +66,11 @@ void FirebirdTest::testEmptyDBConnection() - void FirebirdTest::testIntegerDatabase() - { - uno::Reference< XOfficeDatabaseDocument > xDocument = -+#if HAVE_FIREBIRD_30 -+ getDocumentForFileName("firebird_integer_x64le_ods12.odb"); -+#else - getDocumentForFileName("firebird_integer_x64le.odb"); -+#endif - - uno::Reference< XConnection > xConnection = - getConnectionForDocument(xDocument); --- -2.9.0 - diff --git a/libreoffice-firebird3.patch b/libreoffice-firebird3.patch deleted file mode 100644 index 77ad623..0000000 --- a/libreoffice-firebird3.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Michal Kubecek -Date: Thu, 2 Jun 2016 08:12:37 +0200 -Subject: configure.ac: allow build with Firebird 3.0 -Patch-mainline: Not tagged yet (5.3.0.0.alpha1?) -Git-commit: e5d48f12faec6027bf79411cb69111d90f4e4129 -References: bsc#982485 - -Relax the checks in configure.ac to allow building against recently -released Firebird 3.0. In this version, libfbclient is also used to -access local database files (embedded server mode) rather than -separate libfbembed. - -Change-Id: Id498cbca22409f95ee299a6165cc765efa25eca7 -Reviewed-on: https://gerrit.libreoffice.org/25845 -Tested-by: Jenkins -Reviewed-by: jan iversen ---- - configure.ac | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ebca3bab7665..6abeae315c2e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8653,8 +8653,10 @@ if test "$enable_firebird_sdbc" = "yes" ; then - AC_PATH_PROG(FIREBIRDCONFIG, [fb_config]) - if test -z "$FIREBIRDCONFIG"; then - AC_MSG_NOTICE([No fb_config -- using pkg-config]) -- PKG_CHECK_MODULES(FIREBIRD, fbembed) -- FIREBIRD_VERSION=`pkg-config --modversion fbembed` -+ PKG_CHECK_MODULES([FIREBIRD], [fbclient >= 3], [FIREBIRD_PKGNAME=fbclient], [ -+ PKG_CHECK_MODULES([FIREBIRD], [fbembed], [FIREBIRD_PKGNAME=fbembed]) -+ ]) -+ FIREBIRD_VERSION=`pkg-config --modversion "$FIREBIRD_PKGNAME"` - else - AC_MSG_NOTICE([fb_config found]) - FIREBIRD_VERSION=`$FIREBIRDCONFIG --version` -@@ -8669,19 +8671,20 @@ if test "$enable_firebird_sdbc" = "yes" ; then - if test -n "${FIREBIRD_VERSION}"; then - FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1` - FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2` -- if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5"; then -+ if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5" -o \ -+ "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then - AC_MSG_RESULT([OK]) - else -- AC_MSG_ERROR([Ensure firebird 2.5.x is installed]) -+ AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed]) - fi - else - __save_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} ${FIREBIRD_CFLAGS}" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include --#if defined(FB_API_VER) && FB_API_VER == 25 -+#if defined(FB_API_VER) && (FB_API_VER == 25 || FB_API_VER == 30) - #else - #error "Wrong Firebird API version" --#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x is installed])) -+#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed])) - CFLAGS="${__save_CFLAGS}" - fi - ENABLE_FIREBIRD_SDBC="TRUE" --- -2.9.0 - diff --git a/libreoffice-hotfix-disablebrokenshapetest.patch b/libreoffice-hotfix-disablebrokenshapetest.patch index aa11f50..5c1ed81 100644 --- a/libreoffice-hotfix-disablebrokenshapetest.patch +++ b/libreoffice-hotfix-disablebrokenshapetest.patch @@ -1,8 +1,8 @@ -Index: libreoffice-5.2.4.1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +Index: libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx =================================================================== ---- libreoffice-5.2.4.1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -+++ libreoffice-5.2.4.1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -@@ -1114,29 +1114,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, " +--- libreoffice-5.3.0.0.beta1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ++++ libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +@@ -1102,29 +1102,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, " assertXPath(pXmlDoc, "//w:ind", "start", "1418"); } @@ -29,6 +29,6 @@ Index: libreoffice-5.2.4.1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -#endif -} - - DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx") - { - xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + #endif + + CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/libreoffice.changes b/libreoffice.changes index 96988ea..28b57da 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -4,6 +4,12 @@ Sat Dec 3 12:15:27 UTC 2016 - tchvatal@suse.com - Version update to 5.3.0.beta1: * Starting of testing of new major release - Refresh patch system-pyuno.diff +- Refresh again libreoffice-hotfix-disablebrokenshapetest.patch +- Drop upstreamed patches: + * libreoffice-firebird3-selftest.patch + * libreoffice-firebird3.patch + * 0001-allow-none-gi-support.patch + ------------------------------------------------------------------- Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 8afc5aa..46a9d59 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -39,8 +39,6 @@ Url: http://www.documentfoundation.org/ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz -# test database for Patch18 -Source20: firebird_integer_x64le_ods12.odb Source99: %{name}-rpmlintrc # prebuilt extensions Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt @@ -74,11 +72,6 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs Patch16: libreoffice-hotfix-disablebrokenshapetest.patch -# PATCH-FIX-UPSTREAM: fix build against (system) Firebird 3.0 -Patch17: libreoffice-firebird3.patch -Patch18: libreoffice-firebird3-selftest.patch -# PATCH-FIX-UPSTREAM: taken from 5.3 branch to fix working with sle12 gnome introspection -Patch19: 0001-allow-none-gi-support.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -935,10 +928,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch4 %patch5 %patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -cp -vn %{SOURCE20} dbaccess/qa/unit/data/ %patch990 -p1 # Do not generate doxygen timestamp From 5f801cba62b2c49570e13f8b6927c2132dac63487d9e06e9d4ddba276025a4d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 3 Dec 2016 12:37:31 +0000 Subject: [PATCH 06/23] - Remove --enable-hardlink-deliver switch that is removed from autotools OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=450 --- libreoffice.changes | 1 + libreoffice.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 28b57da..8d6482e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -9,6 +9,7 @@ Sat Dec 3 12:15:27 UTC 2016 - tchvatal@suse.com * libreoffice-firebird3-selftest.patch * libreoffice-firebird3.patch * 0001-allow-none-gi-support.patch +- Remove --enable-hardlink-deliver switch that is removed from autotools ------------------------------------------------------------------- Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 46a9d59..9bedf3d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1029,7 +1029,6 @@ export NOCONFIGURE=yes %endif --enable-evolution2 \ --enable-dbus \ - --enable-hardlink-deliver \ --enable-ext-ct2n \ --enable-ext-nlpsolver \ --enable-ext-numbertext \ From 827bd1ae25701e7963274da8d6c0baef9e18f97fbe428c4b975da7b080066fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 3 Dec 2016 13:33:06 +0000 Subject: [PATCH 07/23] - Add dep on libzmf, libstaroffice OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=451 --- libreoffice.changes | 1 + libreoffice.spec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 8d6482e..0d1343f 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -10,6 +10,7 @@ Sat Dec 3 12:15:27 UTC 2016 - tchvatal@suse.com * libreoffice-firebird3.patch * 0001-allow-none-gi-support.patch - Remove --enable-hardlink-deliver switch that is removed from autotools +- Add dep on libzmf, libstaroffice ------------------------------------------------------------------- Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 9bedf3d..a5cf6a1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -176,12 +176,14 @@ BuildRequires: pkgconfig(liborcus-0.11) BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libstaroffice-0.0) BuildRequires: pkgconfig(libvisio-0.1) >= 0.1 BuildRequires: pkgconfig(libwpd-0.10) >= 0.10 BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) >= 0.4.2 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(libzmf-0.0) BuildRequires: pkgconfig(mdds-1.2) BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(nspr) >= 4.8 From 190c43383573af35b91657ffb1abb8fb27c117da66d2eda938feb26aa12fa491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 3 Dec 2016 14:15:15 +0000 Subject: [PATCH 08/23] - Update internal xmlsec OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=452 --- 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz | 3 +++ ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz | 3 --- libreoffice.changes | 1 + libreoffice.spec | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz delete mode 100644 ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz diff --git a/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz b/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz new file mode 100644 index 0000000..ffdc04d --- /dev/null +++ b/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f +size 1794694 diff --git a/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz b/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz deleted file mode 100644 index c292eb4..0000000 --- a/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 -size 1769329 diff --git a/libreoffice.changes b/libreoffice.changes index 0d1343f..5ccefd6 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -11,6 +11,7 @@ Sat Dec 3 12:15:27 UTC 2016 - tchvatal@suse.com * 0001-allow-none-gi-support.patch - Remove --enable-hardlink-deliver switch that is removed from autotools - Add dep on libzmf, libstaroffice +- Update internal xmlsec ------------------------------------------------------------------- Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index a5cf6a1..2b93785 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -49,7 +49,7 @@ Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 # Internal bundled stuff we can't remove # XMLSec is patched over and over in here -Source2000: %{external_url}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz +Source2000: %{external_url}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz # To build this we would pull cygwin; not worth it Source2001: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll # hsqldb simply does not work with new system version, but luckily we migrate to firebird @@ -172,7 +172,7 @@ BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) >= 0.1 BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.5 BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4 -BuildRequires: pkgconfig(liborcus-0.11) +BuildRequires: pkgconfig(liborcus-0.12) BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librsvg-2.0) From 5b5b1dde0bd4b0aec94a388155f9d6757efb9ee612d0379067a43ae7b2f2c5ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 19 Dec 2016 11:43:21 +0000 Subject: [PATCH 09/23] - Version update to 5.3.0.beta2: * Various bugfixes to bring 5.3 to stability OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=453 --- libreoffice-5.3.0.0.beta1.tar.xz | 3 --- libreoffice-5.3.0.0.beta2.tar.xz | 3 +++ libreoffice-help-5.3.0.0.beta1.tar.xz | 3 --- libreoffice-help-5.3.0.0.beta2.tar.xz | 3 +++ libreoffice-translations-5.3.0.0.beta1.tar.xz | 3 --- libreoffice-translations-5.3.0.0.beta2.tar.xz | 3 +++ libreoffice.changes | 6 ++++++ libreoffice.spec | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 libreoffice-5.3.0.0.beta1.tar.xz create mode 100644 libreoffice-5.3.0.0.beta2.tar.xz delete mode 100644 libreoffice-help-5.3.0.0.beta1.tar.xz create mode 100644 libreoffice-help-5.3.0.0.beta2.tar.xz delete mode 100644 libreoffice-translations-5.3.0.0.beta1.tar.xz create mode 100644 libreoffice-translations-5.3.0.0.beta2.tar.xz diff --git a/libreoffice-5.3.0.0.beta1.tar.xz b/libreoffice-5.3.0.0.beta1.tar.xz deleted file mode 100644 index 1038c17..0000000 --- a/libreoffice-5.3.0.0.beta1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8384876bf214195e4e35c4c1f6f7365e0178eef44111815a4c6dc5050ee931a5 -size 187854296 diff --git a/libreoffice-5.3.0.0.beta2.tar.xz b/libreoffice-5.3.0.0.beta2.tar.xz new file mode 100644 index 0000000..370e14d --- /dev/null +++ b/libreoffice-5.3.0.0.beta2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed9e777d733465dce22ee4fb40547945a39bae66e555f05ef57baf6942a8356b +size 188733560 diff --git a/libreoffice-help-5.3.0.0.beta1.tar.xz b/libreoffice-help-5.3.0.0.beta1.tar.xz deleted file mode 100644 index d883d21..0000000 --- a/libreoffice-help-5.3.0.0.beta1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b962a9d4fd7a0d1abafb2e4d9bbdd19ee635ad7a7b64fb84ad796229d45e6d7 -size 2119464 diff --git a/libreoffice-help-5.3.0.0.beta2.tar.xz b/libreoffice-help-5.3.0.0.beta2.tar.xz new file mode 100644 index 0000000..22c616b --- /dev/null +++ b/libreoffice-help-5.3.0.0.beta2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17198d37fad4211ea9f7838e2ceff95fbf15a765c5b37242d1dc2824d80ad8a7 +size 2121136 diff --git a/libreoffice-translations-5.3.0.0.beta1.tar.xz b/libreoffice-translations-5.3.0.0.beta1.tar.xz deleted file mode 100644 index 70898f7..0000000 --- a/libreoffice-translations-5.3.0.0.beta1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7c4426c223c2215b0b26b0b789b98287de28b606271e2fc8767d13a97058fa7 -size 140756124 diff --git a/libreoffice-translations-5.3.0.0.beta2.tar.xz b/libreoffice-translations-5.3.0.0.beta2.tar.xz new file mode 100644 index 0000000..24cf6dd --- /dev/null +++ b/libreoffice-translations-5.3.0.0.beta2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b3f6ea862faef798f92f1d32ccc55a2142b57ec31d38390dc69e52d6951e9c7 +size 140194120 diff --git a/libreoffice.changes b/libreoffice.changes index 5ccefd6..1a5e3a0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 19 11:42:00 UTC 2016 - tchvatal@suse.com + +- Version update to 5.3.0.beta2: + * Various bugfixes to bring 5.3 to stability + ------------------------------------------------------------------- Sat Dec 3 12:15:27 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 2b93785..af98702 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -30,7 +30,7 @@ %bcond_with kdeintegration %endif Name: libreoffice -Version: 5.3.0.0.beta1 +Version: 5.3.0.0.beta2 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C From 000604ea59f450ad2a0fa9ddbc06a4d39064d105906650841eb35c66aa658e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 19 Dec 2016 13:27:44 +0000 Subject: [PATCH 10/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=454 --- 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar | 3 +++ libreoffice.spec | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar diff --git a/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar b/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar new file mode 100644 index 0000000..55bf1ec --- /dev/null +++ b/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 +size 2448421 diff --git a/libreoffice.spec b/libreoffice.spec index af98702..3897d01 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -59,6 +59,8 @@ Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +# Needed for integration tests +Source2006: http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # PATCH-FIX-SUSE: disable really fragile test run on hsqldb Patch0: disable-flaky-hsqldb-test.patch # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse From 37ee5b239fb1fec1e82d3ae5c45d3bbe2e7f8d6ca4c34c787eec5bfebba16db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 19 Dec 2016 13:41:32 +0000 Subject: [PATCH 11/23] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=455 --- ...lidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar | 3 +++ libreoffice.spec | 1 + 2 files changed, 4 insertions(+) create mode 100644 a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar diff --git a/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar b/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar new file mode 100644 index 0000000..a825351 --- /dev/null +++ b/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34 +size 18033694 diff --git a/libreoffice.spec b/libreoffice.spec index 3897d01..84f5b7e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -61,6 +61,7 @@ Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip # Needed for integration tests Source2006: http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar +Source2007: http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar # PATCH-FIX-SUSE: disable really fragile test run on hsqldb Patch0: disable-flaky-hsqldb-test.patch # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse From c31021d033a627af1ab42757a0f031e9ac61f84eb9db576006d08d8a2d18248b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 4 Jan 2017 20:31:11 +0000 Subject: [PATCH 12/23] - Build firebird driver only for version 3, 2.x series does not pass tests at all - Drop 13.2 support, out of scope as EOL OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=456 --- libreoffice.changes | 7 +++++++ libreoffice.spec | 23 +++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 1a5e3a0..9908773 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 4 20:11:44 UTC 2017 - tchvatal@suse.com + +- Build firebird driver only for version 3, 2.x series does not pass + tests at all +- Drop 13.2 support, out of scope as EOL + ------------------------------------------------------------------- Mon Dec 19 11:42:00 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 84f5b7e..eeb66f4 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,16 @@ %define external_url http://dev-www.libreoffice.org/src/ %define tarball_url http://download.documentfoundation.org/libreoffice/src/5.3.0 # Wether to enable the kde integration -%if 0%{?is_opensuse} || %{suse_version} == 1320 +%if 0%{?is_opensuse} %bcond_without kdeintegration %else %bcond_with kdeintegration %endif +%if 0%{?suse_version} > 1320 +%bcond_without firebird +%else +%bcond_with firebird +%endif Name: libreoffice Version: 5.3.0.0.beta2 Release: 0 @@ -105,8 +110,9 @@ BuildRequires: libbase BuildRequires: libcppunit-devel BuildRequires: liberation-fonts BuildRequires: libexif -# once FB 3.0 is in Factory, change to pkgconfig(fbclient) / pkgconfig(fbembed) -BuildRequires: libfbembed-devel +%if %{with firebird} +BuildRequires: pkgconfig(fbclient) +%endif BuildRequires: libfonts BuildRequires: libformula BuildRequires: libjpeg-devel @@ -1031,6 +1037,11 @@ export NOCONFIGURE=yes --enable-kde4 \ %else --disable-kde4 \ +%endif +%if %{with firebird} + --enable-firebird-sdbc \ +%else + --disable-firebird-sdbc \ %endif --enable-evolution2 \ --enable-dbus \ @@ -1067,8 +1078,10 @@ grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_l mv tmplist file-lists/gnome_list.txt # Remove firebird connector from main package filelist +%if %{with firebird} grep -v "%{_libdir}/libreoffice/program/libfirebird_sdbclo.so" file-lists/common_list.txt > tmplist mv tmplist file-lists/common_list.txt +%endif ################ # update desktop files @@ -1378,9 +1391,11 @@ exit 0 %files -f file-lists/postgresql_list.txt base-drivers-postgresql %defattr(-,root,root) +%if %{with firebird} %files base-drivers-firebird %defattr(-,root,root) %{_libdir}/libreoffice/program/libfirebird_sdbclo.so +%endif %files -f file-lists/filters_list.txt filters-optional %defattr(-,root,root) From fb8fb8f2fde366b601eee4bdd1fc032b417d5c1667ed273104baa3af602e7cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 5 Jan 2017 15:09:36 +0000 Subject: [PATCH 13/23] - Fix unixODBC loading bnc#1017925 * 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=457 --- ...C-changed-soname-to-.2-so-reflect-it.patch | 39 +++++++++++++++++++ libreoffice.changes | 6 +++ libreoffice.spec | 2 + 3 files changed, 47 insertions(+) create mode 100644 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch diff --git a/0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch b/0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch new file mode 100644 index 0000000..c004ad0 --- /dev/null +++ b/0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch @@ -0,0 +1,39 @@ +From 18f068baca7630afdc8d02a4e21a4aa1a9d70f86 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Thu, 5 Jan 2017 16:06:10 +0100 +Subject: [PATCH] unixODBC changed soname to .2 so reflect it + +we dlopen this library and thus we should be able to find it with any +soname, so far .1 and .2 seem to be used. + +Change-Id: Idcd284fada1acdfe8dde46c3056c21b792777280 +--- + dbaccess/source/ui/dlg/odbcconfig.cxx | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx +index cd1b583e1840..163fc8549d06 100644 +--- a/dbaccess/source/ui/dlg/odbcconfig.cxx ++++ b/dbaccess/source/ui/dlg/odbcconfig.cxx +@@ -38,6 +38,7 @@ + #ifdef MACOSX + #define ODBC_LIBRARY "libiodbc.dylib" + #else ++#define ODBC_LIBRARY_2 "libodbc.so.2" + #define ODBC_LIBRARY_1 "libodbc.so.1" + #define ODBC_LIBRARY "libodbc.so" + #endif +@@ -124,6 +125,10 @@ OOdbcEnumeration::OOdbcEnumeration() + if ( !bLoaded ) + bLoaded = load(ODBC_LIBRARY_1); + #endif ++#ifdef ODBC_LIBRARY_2 ++ if ( !bLoaded ) ++ bLoaded = load(ODBC_LIBRARY_2); ++#endif + + if ( bLoaded ) + { +-- +2.11.0 + diff --git a/libreoffice.changes b/libreoffice.changes index 9908773..422a141 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 5 15:08:29 UTC 2017 - tchvatal@suse.com + +- Fix unixODBC loading bnc#1017925 + * 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch + ------------------------------------------------------------------- Wed Jan 4 20:11:44 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index eeb66f4..f6eed51 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -78,6 +78,7 @@ Patch3: system-pyuno.diff # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff +Patch6: 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs Patch16: libreoffice-hotfix-disablebrokenshapetest.patch # try to save space by using hardlinks @@ -938,6 +939,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch3 -p1 %patch4 %patch5 +%patch6 -p1 %patch16 -p1 %patch990 -p1 From 8f0e2aab035efc973723fe3f915689e6a5d511ef2a029013395cd17ebdab12b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 13 Jan 2017 09:23:32 +0000 Subject: [PATCH 14/23] - Version update to 5.3.0.1: * RC candidate stabilizing ont he beta1 bump OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=458 --- libreoffice-5.3.0.0.beta2.tar.xz | 3 --- libreoffice-5.3.0.1.tar.xz | 3 +++ libreoffice-help-5.3.0.0.beta2.tar.xz | 3 --- libreoffice-help-5.3.0.1.tar.xz | 3 +++ libreoffice-translations-5.3.0.0.beta2.tar.xz | 3 --- libreoffice-translations-5.3.0.1.tar.xz | 3 +++ libreoffice.changes | 6 ++++++ libreoffice.spec | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 libreoffice-5.3.0.0.beta2.tar.xz create mode 100644 libreoffice-5.3.0.1.tar.xz delete mode 100644 libreoffice-help-5.3.0.0.beta2.tar.xz create mode 100644 libreoffice-help-5.3.0.1.tar.xz delete mode 100644 libreoffice-translations-5.3.0.0.beta2.tar.xz create mode 100644 libreoffice-translations-5.3.0.1.tar.xz diff --git a/libreoffice-5.3.0.0.beta2.tar.xz b/libreoffice-5.3.0.0.beta2.tar.xz deleted file mode 100644 index 370e14d..0000000 --- a/libreoffice-5.3.0.0.beta2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed9e777d733465dce22ee4fb40547945a39bae66e555f05ef57baf6942a8356b -size 188733560 diff --git a/libreoffice-5.3.0.1.tar.xz b/libreoffice-5.3.0.1.tar.xz new file mode 100644 index 0000000..6cbe823 --- /dev/null +++ b/libreoffice-5.3.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:538313e2fab750ead8410171786369280b7fd551ee7f8b130c58ad2d7937aa09 +size 188943604 diff --git a/libreoffice-help-5.3.0.0.beta2.tar.xz b/libreoffice-help-5.3.0.0.beta2.tar.xz deleted file mode 100644 index 22c616b..0000000 --- a/libreoffice-help-5.3.0.0.beta2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17198d37fad4211ea9f7838e2ceff95fbf15a765c5b37242d1dc2824d80ad8a7 -size 2121136 diff --git a/libreoffice-help-5.3.0.1.tar.xz b/libreoffice-help-5.3.0.1.tar.xz new file mode 100644 index 0000000..37ad333 --- /dev/null +++ b/libreoffice-help-5.3.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42cf1b83e0c3eab64598620ef109a200682713b4f6f79931c48b8a3b9f822252 +size 2123084 diff --git a/libreoffice-translations-5.3.0.0.beta2.tar.xz b/libreoffice-translations-5.3.0.0.beta2.tar.xz deleted file mode 100644 index 24cf6dd..0000000 --- a/libreoffice-translations-5.3.0.0.beta2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b3f6ea862faef798f92f1d32ccc55a2142b57ec31d38390dc69e52d6951e9c7 -size 140194120 diff --git a/libreoffice-translations-5.3.0.1.tar.xz b/libreoffice-translations-5.3.0.1.tar.xz new file mode 100644 index 0000000..3d66b5e --- /dev/null +++ b/libreoffice-translations-5.3.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ca47a03d961ae4b948fadc9530a1d4cfb0cbdc35ac6212461a18c664bcc4688 +size 140468440 diff --git a/libreoffice.changes b/libreoffice.changes index 422a141..e8dfb4f 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 13 09:21:39 UTC 2017 - tchvatal@suse.com + +- Version update to 5.3.0.1: + * RC candidate stabilizing ont he beta1 bump + ------------------------------------------------------------------- Thu Jan 5 15:08:29 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index f6eed51..a8443b6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ %bcond_with firebird %endif Name: libreoffice -Version: 5.3.0.0.beta2 +Version: 5.3.0.1 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C From a945842c8351eb622495f5a77fb0a69c9dec254a5b957d5bdf6e968a75a9d54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 17 Jan 2017 12:39:45 +0000 Subject: [PATCH 15/23] - Drop system-pyuno.diff patch as it breaks services tests as the pyuno was not loadable OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=459 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 6 ------ system-pyuno.diff | 42 ------------------------------------------ 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 system-pyuno.diff diff --git a/libreoffice.changes b/libreoffice.changes index e8dfb4f..5a10de1 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 17 12:38:47 UTC 2017 - tchvatal@suse.com + +- Drop system-pyuno.diff patch as it breaks services tests as the + pyuno was not loadable + ------------------------------------------------------------------- Fri Jan 13 09:21:39 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index a8443b6..3d42e58 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -72,8 +72,6 @@ Patch0: disable-flaky-hsqldb-test.patch # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build Patch1: scp2-user-config-suse.diff -# correctly bootstrap python stuff with system python (deb#501028, bnc#90701) -Patch3: system-pyuno.diff # do not use the broken help; unopkg complained about it when registering extensions # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch4: nlpsolver-no-broken-help.diff @@ -936,7 +934,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %if 0%{?suse_version} < 1330 %patch1 %endif -%patch3 -p1 %patch4 %patch5 %patch6 -p1 @@ -1061,9 +1058,6 @@ export NOCONFIGURE=yes --enable-symbols # no coinormp packages for coinmp -# hack to correctly bootstrap python stuff with system python, (deb#501028, bnc#90701) -sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py - # just call make here as we added the jobs in configure # The check phase is run here too if it is split with nocheck # install of jars get broken sometimes diff --git a/system-pyuno.diff b/system-pyuno.diff deleted file mode 100644 index d5354cd..0000000 --- a/system-pyuno.diff +++ /dev/null @@ -1,42 +0,0 @@ -Index: libreoffice-5.3.0.0.beta1/desktop/scripts/soffice.sh -=================================================================== ---- libreoffice-5.3.0.0.beta1.orig/desktop/scripts/soffice.sh -+++ libreoffice-5.3.0.0.beta1/desktop/scripts/soffice.sh -@@ -137,6 +137,9 @@ if echo "$checks" | grep -q "cc" ; then - exit 1; - fi - -+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} -+export PYTHONPATH -+ - case "`uname -s`" in - NetBSD|OpenBSD|DragonFly) - # this is a temporary hack until we can live with the default search paths -Index: libreoffice-5.3.0.0.beta1/pyuno/source/module/uno.py -=================================================================== ---- libreoffice-5.3.0.0.beta1.orig/pyuno/source/module/uno.py -+++ libreoffice-5.3.0.0.beta1/pyuno/source/module/uno.py -@@ -16,6 +16,10 @@ - # except in compliance with the License. You may obtain a copy of - # the License at http://www.apache.org/licenses/LICENSE-2.0 . - # -+import os -+sys.path.append('@INSTALLDIR@/program') -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc" - import pyuno - import sys - import traceback -Index: libreoffice-5.3.0.0.beta1/pyuno/source/officehelper.py -=================================================================== ---- libreoffice-5.3.0.0.beta1.orig/pyuno/source/officehelper.py -+++ libreoffice-5.3.0.0.beta1/pyuno/source/officehelper.py -@@ -45,7 +45,7 @@ def bootstrap(): - if "UNO_PATH" in os.environ: - sOffice = os.environ["UNO_PATH"] - else: -- sOffice = "" # lets hope for the best -+ sOffice = "@INSTALLDIR@/program" - sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): - sOffice += ".exe" From 1d74e89bf0130ab5c0132882dad23e0a5dfd630a18054d312efb7c9b7b7e1dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 18 Jan 2017 14:32:16 +0000 Subject: [PATCH 16/23] x OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=460 --- libreoffice.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 3d42e58..c68bcbc 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1342,7 +1342,6 @@ exit 0 %{_libdir}/girepository-1.0/LOKDocView-0.1.typelib %{_libdir}/liblibreofficekitgtk.so %dir %{_libdir}/libreoffice/share/libreofficekit -%{_libdir}/libreoffice/share/libreofficekit/handle_graphic.png %{_libdir}/libreoffice/share/libreofficekit/handle_image_end.png %{_libdir}/libreoffice/share/libreofficekit/handle_image_middle.png %{_libdir}/libreoffice/share/libreofficekit/handle_image_start.png From f0e1cf18af8bda6256ce47ae022b0801033ee232aa6565574f7ab3a6e89e62c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 18 Jan 2017 21:21:47 +0000 Subject: [PATCH 17/23] - Provide the breeze-dark content in the breeze icontheme OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=461 --- libreoffice.changes | 5 +++++ libreoffice.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 5a10de1..44166f8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 18 21:21:04 UTC 2017 - tchvatal@suse.com + +- Provide the breeze-dark content in the breeze icontheme + ------------------------------------------------------------------- Tue Jan 17 12:38:47 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index c68bcbc..2524e3b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1442,6 +1442,7 @@ exit 0 %dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share/config %{_datadir}/%{name}/share/config/images_breeze.zip +%{_datadir}/%{name}/share/config/images_breeze_dark.zip %files icon-theme-galaxy %defattr(-,root,root) From b95202ce3a35cb17c9fa2f6053bad78941c5bb3c6a9292a372dba6647a90c6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 20 Jan 2017 12:05:31 +0000 Subject: [PATCH 18/23] - Version update to 5.3.0.2: * RC2 of the 5.3.0 target, stabilizing the lokit OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=462 --- libreoffice-5.3.0.1.tar.xz | 3 --- libreoffice-5.3.0.2.tar.xz | 3 +++ libreoffice-help-5.3.0.1.tar.xz | 3 --- libreoffice-help-5.3.0.2.tar.xz | 3 +++ libreoffice-translations-5.3.0.1.tar.xz | 3 --- libreoffice-translations-5.3.0.2.tar.xz | 3 +++ libreoffice.changes | 6 ++++++ libreoffice.spec | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 libreoffice-5.3.0.1.tar.xz create mode 100644 libreoffice-5.3.0.2.tar.xz delete mode 100644 libreoffice-help-5.3.0.1.tar.xz create mode 100644 libreoffice-help-5.3.0.2.tar.xz delete mode 100644 libreoffice-translations-5.3.0.1.tar.xz create mode 100644 libreoffice-translations-5.3.0.2.tar.xz diff --git a/libreoffice-5.3.0.1.tar.xz b/libreoffice-5.3.0.1.tar.xz deleted file mode 100644 index 6cbe823..0000000 --- a/libreoffice-5.3.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:538313e2fab750ead8410171786369280b7fd551ee7f8b130c58ad2d7937aa09 -size 188943604 diff --git a/libreoffice-5.3.0.2.tar.xz b/libreoffice-5.3.0.2.tar.xz new file mode 100644 index 0000000..4c5bb75 --- /dev/null +++ b/libreoffice-5.3.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:008ccc25ad6ab2fd7ba58b72734270d8904f0f96441ff39a522be4aa9fab84d2 +size 188998340 diff --git a/libreoffice-help-5.3.0.1.tar.xz b/libreoffice-help-5.3.0.1.tar.xz deleted file mode 100644 index 37ad333..0000000 --- a/libreoffice-help-5.3.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42cf1b83e0c3eab64598620ef109a200682713b4f6f79931c48b8a3b9f822252 -size 2123084 diff --git a/libreoffice-help-5.3.0.2.tar.xz b/libreoffice-help-5.3.0.2.tar.xz new file mode 100644 index 0000000..e7e840b --- /dev/null +++ b/libreoffice-help-5.3.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2aadb7a6e4061d8a9ee1c5187b8449c52b9a213ff8e04b8482adc661c1eefe3 +size 2124000 diff --git a/libreoffice-translations-5.3.0.1.tar.xz b/libreoffice-translations-5.3.0.1.tar.xz deleted file mode 100644 index 3d66b5e..0000000 --- a/libreoffice-translations-5.3.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ca47a03d961ae4b948fadc9530a1d4cfb0cbdc35ac6212461a18c664bcc4688 -size 140468440 diff --git a/libreoffice-translations-5.3.0.2.tar.xz b/libreoffice-translations-5.3.0.2.tar.xz new file mode 100644 index 0000000..271cecb --- /dev/null +++ b/libreoffice-translations-5.3.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83a247ef451b85af46ecb4e3459cb3c8219cf99d30399f5149d93e1ef3a61e08 +size 140579124 diff --git a/libreoffice.changes b/libreoffice.changes index 44166f8..73a84d0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 20 12:03:38 UTC 2017 - tchvatal@suse.com + +- Version update to 5.3.0.2: + * RC2 of the 5.3.0 target, stabilizing the lokit + ------------------------------------------------------------------- Wed Jan 18 21:21:04 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 2524e3b..8ffa7ba 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ %bcond_with firebird %endif Name: libreoffice -Version: 5.3.0.1 +Version: 5.3.0.2 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C From c782aad59c70856bb08e0f82915f9acf401e5adbc72c3251e82ca04c99bdaa04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 1 Feb 2017 10:54:58 +0000 Subject: [PATCH 19/23] - Version update to 5.3.0.3: * RC3 of the 5.3 targets with additional fixes OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=463 --- libreoffice-5.3.0.2.tar.xz | 3 --- libreoffice-5.3.0.3.tar.xz | 3 +++ libreoffice-help-5.3.0.2.tar.xz | 3 --- libreoffice-help-5.3.0.3.tar.xz | 3 +++ libreoffice-translations-5.3.0.2.tar.xz | 3 --- libreoffice-translations-5.3.0.3.tar.xz | 3 +++ libreoffice.changes | 6 ++++++ libreoffice.spec | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 libreoffice-5.3.0.2.tar.xz create mode 100644 libreoffice-5.3.0.3.tar.xz delete mode 100644 libreoffice-help-5.3.0.2.tar.xz create mode 100644 libreoffice-help-5.3.0.3.tar.xz delete mode 100644 libreoffice-translations-5.3.0.2.tar.xz create mode 100644 libreoffice-translations-5.3.0.3.tar.xz diff --git a/libreoffice-5.3.0.2.tar.xz b/libreoffice-5.3.0.2.tar.xz deleted file mode 100644 index 4c5bb75..0000000 --- a/libreoffice-5.3.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:008ccc25ad6ab2fd7ba58b72734270d8904f0f96441ff39a522be4aa9fab84d2 -size 188998340 diff --git a/libreoffice-5.3.0.3.tar.xz b/libreoffice-5.3.0.3.tar.xz new file mode 100644 index 0000000..b798390 --- /dev/null +++ b/libreoffice-5.3.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e +size 168797580 diff --git a/libreoffice-help-5.3.0.2.tar.xz b/libreoffice-help-5.3.0.2.tar.xz deleted file mode 100644 index e7e840b..0000000 --- a/libreoffice-help-5.3.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2aadb7a6e4061d8a9ee1c5187b8449c52b9a213ff8e04b8482adc661c1eefe3 -size 2124000 diff --git a/libreoffice-help-5.3.0.3.tar.xz b/libreoffice-help-5.3.0.3.tar.xz new file mode 100644 index 0000000..491ca6c --- /dev/null +++ b/libreoffice-help-5.3.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df58d501b9514160767810df0b0e4b44a01262244f81f83df8654b0ccd4b1a7f +size 1615344 diff --git a/libreoffice-translations-5.3.0.2.tar.xz b/libreoffice-translations-5.3.0.2.tar.xz deleted file mode 100644 index 271cecb..0000000 --- a/libreoffice-translations-5.3.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83a247ef451b85af46ecb4e3459cb3c8219cf99d30399f5149d93e1ef3a61e08 -size 140579124 diff --git a/libreoffice-translations-5.3.0.3.tar.xz b/libreoffice-translations-5.3.0.3.tar.xz new file mode 100644 index 0000000..99c2436 --- /dev/null +++ b/libreoffice-translations-5.3.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4321a57fba1012b30eae6e629f18d4139395fd5751af381dc87e31e084fca1d1 +size 140659960 diff --git a/libreoffice.changes b/libreoffice.changes index 73a84d0..77cb198 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 1 10:53:18 UTC 2017 - tchvatal@suse.com + +- Version update to 5.3.0.3: + * RC3 of the 5.3 targets with additional fixes + ------------------------------------------------------------------- Fri Jan 20 12:03:38 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 8ffa7ba..ed86e8a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ %bcond_with firebird %endif Name: libreoffice -Version: 5.3.0.2 +Version: 5.3.0.3 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C From f33041f4bdd0216705700dca87b22697f4beeedbd4ae08b5b0f07f0863fab0e0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 1 Feb 2017 20:45:41 +0000 Subject: [PATCH 20/23] Accepting request 453873 from home:adamm:branches:devel:libraries:c_c++ - use individual libboost-*-devel packages instead of boost-devel OBS-URL: https://build.opensuse.org/request/show/453873 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=464 --- libreoffice.changes | 5 +++++ libreoffice.spec | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 77cb198..0cd75b8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 1 13:10:25 UTC 2017 - adam.majer@suse.de + +- use individual libboost-*-devel packages instead of boost-devel + ------------------------------------------------------------------- Wed Feb 1 10:53:18 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index ed86e8a..4d4249e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -85,7 +85,14 @@ BuildRequires: %{name}-share-linker BuildRequires: ant BuildRequires: autoconf BuildRequires: bison +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_date_time-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_iostreams-devel +BuildRequires: libboost_system-devel +%else BuildRequires: boost-devel +%endif BuildRequires: bsh2 BuildRequires: commons-codec BuildRequires: commons-httpclient @@ -628,10 +635,10 @@ appearance and behavior. %package base-drivers-mysql Summary: MySQL Database Driver for LibreOffice -# This mysql thing is just dlopened -# WARNING: the soname might change! License: GPL-2.0 and LGPL-3.0 Group: Productivity/Office/Suite +# This mysql thing is just dlopened +# WARNING: the soname might change! Requires: libmysqlclient_r18 Requires: libreoffice-base = %{version} Requires(pre): libreoffice = %{version} From 631912789c42d8843acdba51c4661a94438199612b8ece9e44eff7f372629355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 4 Feb 2017 09:22:49 +0000 Subject: [PATCH 21/23] Accepting request 454584 from home:Zaitor:branches:LibreOffice:Factory Use Liberation2-fonts in TW, please see https://www.freetype.org/freetype2/docs/subpixel-hinting.html for the rationale for this change. OBS-URL: https://build.opensuse.org/request/show/454584 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=465 --- libreoffice.changes | 7 +++++++ libreoffice.spec | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 0cd75b8..060757f 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 4 00:46:52 UTC 2017 - zaitor@opensuse.org + +- Add conditional liberation2-fonts BuildRequires and Recommends + for Tumbleweed, it is better suited for the version of freetype2 + we have available. + ------------------------------------------------------------------- Wed Feb 1 13:10:25 UTC 2017 - adam.majer@suse.de diff --git a/libreoffice.spec b/libreoffice.spec index 4d4249e..9c68554 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -114,7 +114,11 @@ BuildRequires: java-devel >= 1.6 BuildRequires: junit4 BuildRequires: libbase BuildRequires: libcppunit-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: liberation2-fonts +%else BuildRequires: liberation-fonts +%endif BuildRequires: libexif %if %{with firebird} BuildRequires: pkgconfig(fbclient) @@ -217,7 +221,11 @@ Requires: python3 Requires(post): update-desktop-files Requires(postun): update-desktop-files Recommends: google-carlito-fonts +%if 0%{?suse_version} >= 1330 +Recommends: liberation2-fonts +%else Recommends: liberation-fonts +%endif Provides: %{name}-draw-extensions = %{version} Obsoletes: %{name}-draw-extensions < %{version} Provides: %{name}-impress-extensions = %{version} @@ -635,10 +643,10 @@ appearance and behavior. %package base-drivers-mysql Summary: MySQL Database Driver for LibreOffice -License: GPL-2.0 and LGPL-3.0 -Group: Productivity/Office/Suite # This mysql thing is just dlopened # WARNING: the soname might change! +License: GPL-2.0 and LGPL-3.0 +Group: Productivity/Office/Suite Requires: libmysqlclient_r18 Requires: libreoffice-base = %{version} Requires(pre): libreoffice = %{version} From fe98156986278615fb02a299274ff01bf40f51a0dc29486c58710b7f4d73f001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 14 Feb 2017 12:22:41 +0000 Subject: [PATCH 22/23] - Fixup pyuno loading as it broke when we dropped the uno patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=466 --- libreoffice.changes | 5 +++++ libreoffice.spec | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 060757f..517fe46 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 14 12:20:48 UTC 2017 - tchvatal@suse.com + +- Fixup pyuno loading as it broke when we dropped the uno patch + ------------------------------------------------------------------- Sat Feb 4 00:46:52 UTC 2017 - zaitor@opensuse.org diff --git a/libreoffice.spec b/libreoffice.spec index 9c68554..8f66a75 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1221,6 +1221,13 @@ done # Remove pointless readmes rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ +# Prepare uno path detection, can't be patched in because it breaks tests +echo "import sys, os" > uno.py +echo "sys.path.append('%{baseinstdir}/program')" >> uno.py +echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{_libdir}/libreoffice/program/fundamentalrc')" >> uno.py +cat %{buildroot}%{_libdir}/%{name}/program/uno.py >> uno.py +cp uno.py %{buildroot}%{_libdir}/%{name}/program/uno.py + # Generate python cache files %py3_compile %{buildroot}/%{_libdir}/libreoffice/program/ %py3_compile %{buildroot}/%{_libdir}/libreoffice/share/extensions/ @@ -1249,8 +1256,10 @@ ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/ mkdir -p %{buildroot}%{python3_sitelib} ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.py ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py +ln -s %{_libdir}/libreoffice/program/officehelper.py %{buildroot}%{python3_sitelib}/officehelper.py echo "%{python3_sitelib}/uno.py" >> file-lists/pyuno_list.txt echo "%{python3_sitelib}/unohelper.py" >> file-lists/pyuno_list.txt +echo "%{python3_sitelib}/officehelper.py" >> file-lists/pyuno_list.txt # move glade catalog to system glade dir install -m 0755 -d %{buildroot}%{_datadir}/glade/catalogs From fd98b6e4bb78a827ac891bd7a6c020ce36a10e2b083b643477606d3bacc74513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Feb 2017 14:48:52 +0000 Subject: [PATCH 23/23] Accepting request 458472 from home:michel_mno:branches:LibreOffice:Factory - bypass upstream bug for aarch64 and ppc64/ppc64le https://bugs.documentfoundation.org/show_bug.cgi?id=105519 removing some fods data files source of test failure. only a new sr (but same bypass as previous one) to be compatible with last available version. OBS-URL: https://build.opensuse.org/request/show/458472 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=467 --- libreoffice.changes | 7 +++++++ libreoffice.spec | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 517fe46..328a585 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 16 12:19:35 UTC 2017 - normand@linux.vnet.ibm.com + +- bypass upstream bug for aarch64 and ppc64/ppc64le + https://bugs.documentfoundation.org/show_bug.cgi?id=105519 + removing some fods data files source of test failure. + ------------------------------------------------------------------- Tue Feb 14 12:20:48 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 8f66a75..84aef6e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -959,6 +959,15 @@ Provides additional %{langname} translations and resources for %{project}. \ echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile +# bypass test failure tracked by upstream bug +# https://bugs.documentfoundation.org/show_bug.cgi?id=105519 +%ifarch aarch64 ppc64 ppc64le +for xx in forecast.ets.add forecast.ets.mult linest logest minverse rate +do + rm sc/qa/unit/data/functions/fods/$xx.fods +done +%endif + %build # Parallel build settings ... lo_jobs="%{?jobs:%{jobs}}"