[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 4 commits - include/LibreOfficeKit sysui/desktop
David Tardon
dtardon at redhat.com
Mon Dec 7 04:14:28 PST 2015
include/LibreOfficeKit/LibreOfficeKitInit.h | 9 +++++++++
sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml | 4 ++--
sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml | 4 ++--
sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml | 4 ++--
sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml | 4 ++--
sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml | 4 ++--
6 files changed, 19 insertions(+), 10 deletions(-)
New commits:
commit 01825a8c1722161876fa8209e15e413c44774a5c
Author: David Tardon <dtardon at redhat.com>
Date: Mon Dec 7 13:10:50 2015 +0100
improve error message for nonexist. path
... which is currently somewhat misleading, because it mentions
libmerged.so.
Change-Id: I1ab21ce0fe2f94eba1831c2c977d900827f320f1
(cherry picked from commit 764ec21307009a84b2611fed5cb20069caa6d566)
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 1a20c8ce..380383b 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -155,6 +155,13 @@ static void *lok_dlopen( const char *install_path, char ** _imp_lib )
if (!install_path)
return NULL;
+ struct stat dir_st;
+ if (stat(install_path, &dir_st) != 0)
+ {
+ fprintf(stderr, "installation path \"%s\" does not exist\n", install_path);
+ return NULL;
+ }
+
// allocate large enough buffer
partial_length = strlen(install_path);
imp_lib = (char *) malloc(partial_length + sizeof(TARGET_LIB) + sizeof(TARGET_MERGED_LIB) + 2);
commit 125382803df6502e467cb25b6ee70c24d5f4dfc0
Author: David Tardon <dtardon at redhat.com>
Date: Mon Dec 7 13:09:07 2015 +0100
tdf#96243 don't crash if LibO install. wasn't found
Change-Id: I538e7238feb711a7d71faf745033264894f688f4
(cherry picked from commit 7f73ea2e3975b305e09467eb7980a3d01cd37de9)
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)
commit 88de77fd6287a1e48fdf2da7f5793194bb138e03
Author: David Tardon <dtardon at redhat.com>
Date: Mon Dec 7 13:02:08 2015 +0100
fix typo
Change-Id: I2889ea7e0ca266675b05b8d9aff6113c8f6e9634
(cherry picked from commit 4915a2bed6c95d706e52b4aad1ba62c2011b0675)
diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
index 2ca8a8f..0257878 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -4,7 +4,7 @@
<metadata_license>CC0-1.0</metadata_license>
<project_license>MPL-2.0</project_license>
<name>LibreOffice Base</name>
-<summary>Database manaager part of the LibreOffice productivity suite</summary>
+<summary>Database manager part of the LibreOffice productivity suite</summary>
<description>
<p>
Base is a powerful database manager, part of the LibreOffice productivity suite.
commit 2b5d5ab9aeeff082025d25b2bfe897e2aeee4c99
Author: David Tardon <dtardon at redhat.com>
Date: Mon Dec 7 12:55:11 2015 +0100
update the appstream files to most recent version of the spec
Change-Id: I6b23be2af3ab28431266075da389b62372508961
(cherry picked from commit 8d7d3469da772d6ffcc0ed4fc69ea28e1813b407)
diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
index 6338a37..2ca8a8f 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>libreoffice-base.desktop</id>
+<metadata_license>CC0-1.0</metadata_license>
<project_license>MPL-2.0</project_license>
<name>LibreOffice Base</name>
-<summary>database manaager part of the LibreOffice productivity suite</summary>
+<summary>Database manaager part of the LibreOffice productivity suite</summary>
<description>
<p>
Base is a powerful database manager, part of the LibreOffice productivity suite.
@@ -29,7 +30,6 @@ to connect to virtually any other existing database engine as well.
<screenshot type="default">http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png</screenshot>
<screenshot>http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-80.png</screenshot>
</screenshots>
-<project_group>The Document Foundation</project_group>
<developer_name>The Document Foundation</developer_name>
<updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
</component>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
index b8beb71..836f100 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>libreoffice-calc.desktop</id>
+<metadata_license>CC0-1.0</metadata_license>
<project_license>MPL-2.0</project_license>
<name>LibreOffice Calc</name>
-<summary>spreadsheet program of the LibreOffice productivity suite</summary>
+<summary>Spreadsheet program of the LibreOffice productivity suite</summary>
<description>
<p>
Calc is a powerful and extensible spreadsheet program, part of the LibreOffice
@@ -22,7 +23,6 @@ worrying about compatibility.
<screenshots>
<screenshot type="default">http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png</screenshot>
</screenshots>
-<project_group>The Document Foundation</project_group>
<developer_name>The Document Foundation</developer_name>
<updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
</component>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
index 2868598..4888653 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>libreoffice-draw.desktop</id>
+<metadata_license>CC0-1.0</metadata_license>
<project_license>MPL-2.0</project_license>
<name>LibreOffice Draw</name>
-<summary>graphics editor part of the LibreOffice productivity suite</summary>
+<summary>Graphics editor part of the LibreOffice productivity suite</summary>
<description>
<p>
LibreOffice Draw is an easy-to-use graphics editor, which empowers you to create
@@ -28,7 +29,6 @@ worrying about compatibility.
<screenshot type="default">http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png</screenshot>
<screenshot>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-03-Square-fdo75097.png</screenshot>
</screenshots>
-<project_group>The Document Foundation</project_group>
<developer_name>The Document Foundation</developer_name>
<updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
</component>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
index ccb0e92..6174a0865 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>libreoffice-impress.desktop</id>
+<metadata_license>CC0-1.0</metadata_license>
<project_license>MPL-2.0</project_license>
<name>LibreOffice Impress</name>
-<summary>presentation program of the LibreOffice productivity suite</summary>
+<summary>Presentation program of the LibreOffice productivity suite</summary>
<description>
<p>
Impress is a presentation program and part of the LibreOffice productivity suite.
@@ -23,7 +24,6 @@ worrying about compatibility.
<screenshots>
<screenshot type="default">http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Impress-01-Blank.png</screenshot>
</screenshots>
-<project_group>The Document Foundation</project_group>
<developer_name>The Document Foundation</developer_name>
<updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
</component>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
index fbd09a7..7e4b07f 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>libreoffice-writer.desktop</id>
+<metadata_license>CC0-1.0</metadata_license>
<project_license>MPL-2.0</project_license>
<name>LibreOffice Writer</name>
-<summary>word processor part of the LibreOffice productivity suite</summary>
+<summary>Word processor part of the LibreOffice productivity suite</summary>
<description>
<p>
Writer is the word processor inside LibreOffice productivity suite.
@@ -30,7 +31,6 @@ worrying about compatibility.
<screenshot type="default">http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-02-Table-of-Contents-Getting-Started-Guide-4-2.png</screenshot>
<screenshot>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-03-Technical-Doc-fdo83524.png</screenshot>
</screenshots>
-<project_group>The Document Foundation</project_group>
<developer_name>The Document Foundation</developer_name>
<updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
</component>
More information about the Libreoffice-commits
mailing list