pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add 0001-allow-none-gi-support.patch: don't use

Browse Source 
"nullable" for introspection, since it isn't available on SLE12
  version of gobject-introspection (bsc#1000102).

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=434
This commit is contained in:
Tomáš Chvátal 2016-10-24 11:10:31 +00:00 committed by Git OBS Bridge
parent 243c71c122
commit c346b19dd9
3 changed files with 83 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
0001-allow-none-gi-support.patch Normal file
View File

@ -0,0 +1,71 @@
From 84bfe584e4bd03a7b6e2c1e68c65bf99ae83c839 Mon Sep 17 00:00:00 2001
From: Pranav Kant <pranavk@collabora.co.uk>
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
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index cb96f20..a2312d6 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): 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): 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
@@ -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): 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): 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): the password, NULL for no password
+ * @pPassword: (nullable): (allow-none): the password, NULL for no password
*
* Set the password for password protected documents
*/
--
cgit v0.10.2

7
libreoffice.changes
View File

@ -4,6 +4,13 @@ Wed Sep 28 12:39:04 UTC 2016 - tchvatal@suse.com
- Version update to 5.2.2.2:
* Various fixes for the 5.2 branch
-------------------------------------------------------------------
Sun Sep 25 20:13:08 UTC 2016 - mgorse@suse.com
- Add 0001-allow-none-gi-support.patch: don't use
"nullable" for introspection, since it isn't available on SLE12
version of gobject-introspection (bsc#1000102).
-------------------------------------------------------------------
Mon Sep 12 09:46:37 UTC 2016 - zaitor@opensuse.org

7
libreoffice.spec
View File

@ -74,6 +74,8 @@ 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
@ -613,10 +615,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}
@ -922,6 +924,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
cp -vn %{SOURCE20} dbaccess/qa/unit/data/
%patch990 -p1