From 2ae68eb0a22f8c1e147c8d85c6ca489be865fafd Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 7 Dec 2015 14:08:57 +0100 Subject: [PATCH] add some fixes for LOKDocView --- ...-crash-if-LibO-install.-wasn-t-found.patch | 27 ++++++++++++++ ...46-Make-pRenderingArguments-nullable.patch | 35 +++++++++++++++++++ libreoffice.spec | 2 ++ 3 files changed, 64 insertions(+) create mode 100644 0001-tdf-96243-don-t-crash-if-LibO-install.-wasn-t-found.patch create mode 100644 0001-tdf-96246-Make-pRenderingArguments-nullable.patch diff --git a/0001-tdf-96243-don-t-crash-if-LibO-install.-wasn-t-found.patch b/0001-tdf-96243-don-t-crash-if-LibO-install.-wasn-t-found.patch new file mode 100644 index 0000000..78a772b --- /dev/null +++ b/0001-tdf-96243-don-t-crash-if-LibO-install.-wasn-t-found.patch @@ -0,0 +1,27 @@ +From 125382803df6502e467cb25b6ee70c24d5f4dfc0 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 7 Dec 2015 13:09:07 +0100 +Subject: [PATCH] tdf#96243 don't crash if LibO install. wasn't found + +Change-Id: I538e7238feb711a7d71faf745033264894f688f4 +(cherry picked from commit 7f73ea2e3975b305e09467eb7980a3d01cd37de9) +--- + include/LibreOfficeKit/LibreOfficeKitInit.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h +index e2af109..1a20c8ce 100644 +--- a/include/LibreOfficeKit/LibreOfficeKitInit.h ++++ b/include/LibreOfficeKit/LibreOfficeKitInit.h +@@ -220,6 +220,8 @@ static LibreOfficeKit *lok_init_2( const char *install_path, const char *user_p + LokHookFunction2 *pSym2; + + dlhandle = lok_dlopen(install_path, &imp_lib); ++ if (!dlhandle) ++ return NULL; + + pSym2 = (LokHookFunction2 *) lok_dlsym(dlhandle, "libreofficekit_hook_2"); + if (!pSym2) +-- +2.5.0 + diff --git a/0001-tdf-96246-Make-pRenderingArguments-nullable.patch b/0001-tdf-96246-Make-pRenderingArguments-nullable.patch new file mode 100644 index 0000000..9f45ce8 --- /dev/null +++ b/0001-tdf-96246-Make-pRenderingArguments-nullable.patch @@ -0,0 +1,35 @@ +From f37903004d93e7d7b008b2667881159bd8fee1e1 Mon Sep 17 00:00:00 2001 +From: Pranav Kant +Date: Sun, 6 Dec 2015 23:41:57 +0530 +Subject: [PATCH] tdf#96246: Make pRenderingArguments nullable + +Type gchar* is not nullable by convention. + +See: +https://wiki.gnome.org/Projects/GObjectIntrospection/Annotations#Nullable_parameters + +Change-Id: Ibfee816a3ef2d29c7376071fb61eda7bf0538efb +Reviewed-on: https://gerrit.libreoffice.org/20425 +Tested-by: Jenkins +Reviewed-by: Miklos Vajna +(cherry picked from commit 9e9703389e015d0f3520344715df6719559362e4) +--- + include/LibreOfficeKit/LibreOfficeKitGtk.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h +index c947ce3..8b6092c 100644 +--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h ++++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h +@@ -65,7 +65,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: lok::Document::initializeForRendering() arguments. ++ * @pRenderingArguments: (nullable): lok::Document::initializeForRendering() arguments. + * @cancellable: + * @callback: + * @userdata: +-- +2.5.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 3c122fe..fb76048 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -324,6 +324,8 @@ Patch17: 0001-Resolves-rhbz-1285380-get-menus-working-under-waylan.patch Patch18: 0001-gtk3-wayland-wrong-dialog-sizes.patch Patch19: 0001-fix-powerpc-build.patch Patch20: 0001-update-the-appstream-files-to-most-recent-version-of.patch +Patch21: 0001-tdf-96243-don-t-crash-if-LibO-install.-wasn-t-found.patch +Patch22: 0001-tdf-96246-Make-pRenderingArguments-nullable.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice