From 9d19a5cb77d1e958831e8a4b65aa09a294fc6f3c80e2f9448671d7d14be61d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 18 Mar 2017 19:28:44 +0000 Subject: [PATCH 1/2] Accepting request 479099 from home:mgorse:branches:LibreOffice:Factory - Add gi-annotation-syntax.patch: the (allow-none) annotations weren't being parsed, leading to breakage on SLE (bsc#1028817) (I'm not sure what the conventions are for patches, so I might not have done this correctly. Patch also sent upstream) OBS-URL: https://build.opensuse.org/request/show/479099 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=476 --- gi-annotation-syntax.patch | 64 ++++++++++++++++++++++++++++++++++++++ libreoffice.changes | 6 ++++ libreoffice.spec | 2 ++ 3 files changed, 72 insertions(+) create mode 100644 gi-annotation-syntax.patch diff --git a/gi-annotation-syntax.patch b/gi-annotation-syntax.patch new file mode 100644 index 0000000..ae5b6ad --- /dev/null +++ b/gi-annotation-syntax.patch @@ -0,0 +1,64 @@ +From b0b5c92a77788e451cda8e78d7d9f3362d7b119a Mon Sep 17 00:00:00 2001 +From: Mike Gorse +Date: Fri, 10 Mar 2017 17:34:27 -0600 +Subject: [PATCH] tdf#102511: Fix gobject-introspection annotation syntax + +--- + include/LibreOfficeKit/LibreOfficeKitGtk.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h +index a2312d6..dd35505 100644 +--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h ++++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h +@@ -42,7 +42,7 @@ GType lok_doc_view_get_type (void) G_GNUC + + /** + * lok_doc_view_new: +- * @pPath: (nullable): (allow-none): 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_view_new (const gchar* + + /** + * lok_doc_view_new_from_user_profile: +- * @pPath: (nullable): (allow-none): 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): (allow-none): 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 +@@ -75,7 +75,7 @@ GtkWidget* lok_doc_view_new_from_user_profile (const gchar* + /** + * lok_doc_view_new_from_widget: + * @pDocView: The #LOKDocView instance +- * @pRenderingArguments: (nullable): (allow-none): lok::Document::initializeForRendering() arguments. ++ * @pRenderingArguments: (nullable) (allow-none): lok::Document::initializeForRendering() arguments. + * + * Returns: (transfer none): The #LOKDocView widget instance. + */ +@@ -86,7 +86,7 @@ GtkWidget* lok_doc_view_new_from_widget (LOKDocView* + * 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): (allow-none): lok::Document::initializeForRendering() arguments. ++ * @pRenderingArguments: (nullable) (allow-none): lok::Document::initializeForRendering() arguments. + * @cancellable: + * @callback: + * @userdata: +@@ -309,7 +309,7 @@ gboolean lok_doc_view_paste (LOKDocView* + * 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): (allow-none): the password, NULL for no password ++ * @pPassword: (nullable) (allow-none): the password, NULL for no password + * + * Set the password for password protected documents + */ +-- +2.6.6 + diff --git a/libreoffice.changes b/libreoffice.changes index 20374dd..a95b292 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 10 23:37:48 UTC 2017 - mgorse@suse.com + +- Add gi-annotation-syntax.patch: the (allow-none) annotations + weren't being parsed, leading to breakage on SLE (bsc#1028817) + ------------------------------------------------------------------- Mon Feb 27 13:59:24 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 610c860..51b368a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -78,6 +78,7 @@ 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 +Patch17: gi-annotation-syntax.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -944,6 +945,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch4 %patch5 %patch16 -p1 +%patch17 -p1 %patch990 -p1 # Do not generate doxygen timestamp From dad69289a304802f921578ffd20859528857d7e8f63ce0af8553260bb7d546e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 18 Mar 2017 19:59:55 +0000 Subject: [PATCH 2/2] - Version update to 5.3.1.2: * official 5.3.1 release OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=477 --- libreoffice-5.3.1.1.tar.xz | 3 --- libreoffice-5.3.1.2.tar.xz | 3 +++ libreoffice-help-5.3.1.1.tar.xz | 3 --- libreoffice-help-5.3.1.2.tar.xz | 3 +++ libreoffice-translations-5.3.1.1.tar.xz | 3 --- libreoffice-translations-5.3.1.2.tar.xz | 3 +++ libreoffice.changes | 6 ++++++ libreoffice.spec | 3 ++- 8 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 libreoffice-5.3.1.1.tar.xz create mode 100644 libreoffice-5.3.1.2.tar.xz delete mode 100644 libreoffice-help-5.3.1.1.tar.xz create mode 100644 libreoffice-help-5.3.1.2.tar.xz delete mode 100644 libreoffice-translations-5.3.1.1.tar.xz create mode 100644 libreoffice-translations-5.3.1.2.tar.xz diff --git a/libreoffice-5.3.1.1.tar.xz b/libreoffice-5.3.1.1.tar.xz deleted file mode 100644 index aa4ca39..0000000 --- a/libreoffice-5.3.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bbb8c09634a17ef19d8ab7ac79966f04fd03f8b561a8b3d9b77b9c395e16d3e -size 169363848 diff --git a/libreoffice-5.3.1.2.tar.xz b/libreoffice-5.3.1.2.tar.xz new file mode 100644 index 0000000..20f4311 --- /dev/null +++ b/libreoffice-5.3.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5746cd7ccaf64e51eb0fc07128e75cf145a32b318d572aba18855f14c10754ff +size 189706056 diff --git a/libreoffice-help-5.3.1.1.tar.xz b/libreoffice-help-5.3.1.1.tar.xz deleted file mode 100644 index 31c1518..0000000 --- a/libreoffice-help-5.3.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23e890ca384e7274d1e6104cbc7660a3c02caa2937c360dd8d53d7f2afff1218 -size 1615320 diff --git a/libreoffice-help-5.3.1.2.tar.xz b/libreoffice-help-5.3.1.2.tar.xz new file mode 100644 index 0000000..6eb6fad --- /dev/null +++ b/libreoffice-help-5.3.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df49c7bf1caa872f542a69875b44b450b724644585fc847f41e549f88da4c20e +size 2127368 diff --git a/libreoffice-translations-5.3.1.1.tar.xz b/libreoffice-translations-5.3.1.1.tar.xz deleted file mode 100644 index e2dedd4..0000000 --- a/libreoffice-translations-5.3.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:701b8eb20c59f69cc191cbe2c5fcbdd5ebe6f5ea5b1385c97fe74456b0b0605e -size 140722684 diff --git a/libreoffice-translations-5.3.1.2.tar.xz b/libreoffice-translations-5.3.1.2.tar.xz new file mode 100644 index 0000000..a45b074 --- /dev/null +++ b/libreoffice-translations-5.3.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbe3c7f2bb5888ab0620a17298701e2d5ca88106b4134f7fb807d3ea263668e4 +size 140812936 diff --git a/libreoffice.changes b/libreoffice.changes index a95b292..e560231 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 18 19:58:29 UTC 2017 - tchvatal@suse.com + +- Version update to 5.3.1.2: + * official 5.3.1 release + ------------------------------------------------------------------- Fri Mar 10 23:37:48 UTC 2017 - mgorse@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 51b368a..c222e08 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ %bcond_with firebird %endif Name: libreoffice -Version: 5.3.1.1 +Version: 5.3.1.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 @@ -78,6 +78,7 @@ 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: merged in 5.4 Patch17: gi-annotation-syntax.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff