9d19a5cb77
- 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
65 lines
3.2 KiB
Diff
65 lines
3.2 KiB
Diff
From b0b5c92a77788e451cda8e78d7d9f3362d7b119a Mon Sep 17 00:00:00 2001
|
|
From: Mike Gorse <mgorse@suse.com>
|
|
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
|
|
|