- Refresh a bit patch 0001-allow-none-gi-support.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=436
This commit is contained in:
Tomáš Chvátal 2016-10-31 13:54:25 +00:00 committed by Git OBS Bridge
parent bb1842fdff
commit d4069cecee
2 changed files with 9 additions and 20 deletions

View File

@ -14,11 +14,11 @@ bump the GI version in LibreOffice to atleast 1.42
Change-Id: I98a1f3d2205ec5afd8060f16e69c5f938f229e26 Change-Id: I98a1f3d2205ec5afd8060f16e69c5f938f229e26
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h Index: libreoffice-5.2.3.2/include/LibreOfficeKit/LibreOfficeKitGtk.h
index cb96f20..a2312d6 100644 ===================================================================
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h --- libreoffice-5.2.3.2.orig/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h +++ libreoffice-5.2.3.2/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -42,7 +42,7 @@ GType lok_doc_view_get_type (void) G_GNUC @@ -42,7 +42,7 @@ GType lok_doc_v
/** /**
* lok_doc_view_new: * lok_doc_view_new:
@ -27,7 +27,7 @@ index cb96f20..a2312d6 100644
* path which in most cases would be $libdir/libreoffice/program * path which in most cases would be $libdir/libreoffice/program
* @cancellable: The cancellable object that you can use to cancel this * @cancellable: The cancellable object that you can use to cancel this
* operation. * operation.
@@ -56,9 +56,9 @@ GtkWidget* lok_doc_view_new (const gchar* @@ -56,9 +56,9 @@ GtkWidget* lok_doc_v
/** /**
* lok_doc_view_new_from_user_profile: * lok_doc_view_new_from_user_profile:
@ -39,16 +39,7 @@ index cb96f20..a2312d6 100644
* special vnd.sun.star.pathname URL. Pass non-null to be able to use this * special vnd.sun.star.pathname URL. Pass non-null to be able to use this
* widget and LibreOffice itself in parallel. * widget and LibreOffice itself in parallel.
* @cancellable: The cancellable object that you can use to cancel this * @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* @@ -84,7 +84,7 @@ GtkWidget* lok_doc_v
/**
* lok_doc_view_new_from_widget:
* @pDocView: The #LOKDocView instance
- * @pRenderingArguments: (nullable): 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: * lok_doc_view_open_document:
* @pDocView: The #LOKDocView instance * @pDocView: The #LOKDocView instance
* @pPath: (transfer full): The path of the document that #LOKDocView widget should try to open * @pPath: (transfer full): The path of the document that #LOKDocView widget should try to open
@ -57,7 +48,7 @@ index cb96f20..a2312d6 100644
* @cancellable: * @cancellable:
* @callback: * @callback:
* @userdata: * @userdata:
@@ -309,7 +309,7 @@ gboolean lok_doc_view_paste (LOKDocView* @@ -307,7 +307,7 @@ gboolean lok_doc_
* lok_doc_view_set_document_password: * lok_doc_view_set_document_password:
* @pDocView: The #LOKDocView instance * @pDocView: The #LOKDocView instance
* @pUrl: the URL of the document to set password for, as sent with signal `password-required` * @pUrl: the URL of the document to set password for, as sent with signal `password-required`
@ -66,6 +57,3 @@ index cb96f20..a2312d6 100644
* *
* Set the password for password protected documents * Set the password for password protected documents
*/ */
--
cgit v0.10.2

View File

@ -4,6 +4,7 @@ Mon Oct 31 11:43:29 UTC 2016 - tchvatal@suse.com
- Version update to 5.2.3.2: - Version update to 5.2.3.2:
* Various small fixes in the 5.2 branch * Various small fixes in the 5.2 branch
- Move the firebird db connector to subpackage wrt bsc#1003896 - Move the firebird db connector to subpackage wrt bsc#1003896
- Refresh a bit patch 0001-allow-none-gi-support.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 28 12:39:04 UTC 2016 - tchvatal@suse.com Wed Sep 28 12:39:04 UTC 2016 - tchvatal@suse.com