[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - solenv/flatpak-manifest.in

2019-01-18 Thread Libreoffice Gerrit user 
 solenv/flatpak-manifest.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 35d4bcd1fea4021bd272290aa08aead36c4a00f5
Author: Stephan Bergmann 
AuthorDate: Thu Jan 17 09:19:55 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Jan 18 09:01:28 2019 +0100

Adapt solenv/flatpak-manifest.in to recent download.lst changes

Reviewed-on: https://gerrit.libreoffice.org/66496
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 5e89aad61e143ad6a52291ef7065f5b22e348c85)
Conflicts:
solenv/flatpak-manifest.in

Change-Id: I9400c8fa5b7763debc13274f7e001b6425d8392e
Reviewed-on: https://gerrit.libreoffice.org/66524
Reviewed-by: Michael Stahl 
Tested-by: Jenkins
(cherry picked from commit bdc9aafd629d5234b8de62d995156b1c3ce75782)
Reviewed-on: https://gerrit.libreoffice.org/66542

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 5ee8909a84c1..ec1ac90d7e19 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -405,10 +405,10 @@
 "dest-filename": "external/tarballs/liborcus-0.13.4.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz;,
-"sha256": 
"2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7",
+"url": 
"https://dev-www.libreoffice.org/src/poppler-0.73.0.tar.xz;,
+"sha256": 
"e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03",
 "type": "file",
-"dest-filename": "external/tarballs/poppler-0.66.0.tar.xz"
+"dest-filename": "external/tarballs/poppler-0.73.0.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - solenv/flatpak-manifest.in

2018-07-25 Thread Libreoffice Gerrit user 
 solenv/flatpak-manifest.in |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 1d0f07887166577fc9769e028a089e6051a38ed2
Author: Stephan Bergmann 
AuthorDate: Wed Jul 25 12:52:38 2018 +0200
Commit: Eike Rathke 
CommitDate: Thu Jul 26 01:15:50 2018 +0200

Adapt solenv/flatpak-manifest.in to recent download.lst changes

(cherry picked from commit 5c016d6ae4e59629cfd0b80c631f67cf46e42d3e)
Conflicts:
solenv/flatpak-manifest.in

Change-Id: I7799abe1a6fc9cf79a751d76360ea7ad2face133
Reviewed-on: https://gerrit.libreoffice.org/57982
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c2d4b20ffd06..5ee8909a84c1 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -279,10 +279,10 @@
 "dest-filename": 
"external/tarballs/libfreehand-0.1.2.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2;,
-"sha256": 
"b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854",
+"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2;,
+"sha256": 
"14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878",
 "type": "file",
-"dest-filename": 
"external/tarballs/language-subtag-registry-2018-03-30.tar.bz2"
+"dest-filename": 
"external/tarballs/language-subtag-registry-2018-04-23.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2;,
@@ -405,10 +405,10 @@
 "dest-filename": "external/tarballs/liborcus-0.13.4.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz;,
-"sha256": 
"a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641",
+"url": 
"https://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz;,
+"sha256": 
"2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7",
 "type": "file",
-"dest-filename": "external/tarballs/poppler-0.59.0.tar.xz"
+"dest-filename": "external/tarballs/poppler-0.66.0.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - solenv/flatpak-manifest.in

2018-06-07 Thread Stephan Bergmann 
 solenv/flatpak-manifest.in |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 4ebaf1e69bf73a756af9b80c8bbd05c4ae308231
Author: Stephan Bergmann 
Date:   Thu Jun 7 17:36:37 2018 +0200

Merge in Flatpak improvements

...from :

commit 0242fa00493c0521d75c60cc4987fb8c7f3abeb1
Author: Robert McQueen 
Date:   Tue May 15 11:08:30 2018 +0100

add missing share of dconf runtime dir

This breaks dconf change notifications, including the GSettings used 
for Gtk+
themes. Could also cause other weird settings problems.

https://github.com/flathub/org.libreoffice.LibreOffice/issues/31

commit 800d0d553fec6bd093f813cb4aa2f10dcbe10aee
Author: Stephan Bergmann 
Date:   Thu May 31 18:02:13 2018 +0200

Re-enable GIO support

...that was inadvertently lost when switching from the GNOME to the
freedesktop.org runtime.  For one, LO configure's --disable-gtk 
erroneously
implied --disable-gio, even under --enable-gtk3.  For another, gvfs is 
missing
from the freedesktop.org runtime; the recipe is copied from
.

This hopefully fixes
 
"Again unable
to open files on network shares".

Change-Id: Ib0a3680dc4eb2595eb2d8b0bb30c54082651686c
Reviewed-on: https://gerrit.libreoffice.org/55431
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 67aaa98600269e6b8fa631146c3649a261369471)
Reviewed-on: https://gerrit.libreoffice.org/55438

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 1bc50cf67a37..42d2189935c2 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -59,6 +59,19 @@
 ]
 },
 {
+"name": "gvfs",
+"cleanup": [ "/libexec/*", "/share/dbus-1/services/*", 
"/share/gvfs/mounts" ],
+"config-opts": [ "--disable-hal", "--disable-gdu", 
"--disable-gcr", "--disable-obexftp",
+ "--disable-avahi", "--disable-documentation", 
"--disable-admin" ],
+"sources": [
+{
+"type": "archive",
+"url": 
"https://download.gnome.org/sources/gvfs/1.36/gvfs-1.36.1.tar.xz;,
+"sha256": 
"3840dff386c2c8a445337bea4ade0eb71339efaff8602767659fa2896792f026"
+}
+]
+},
+{
 "name": "libreoffice",
 "sources": [
 {
@@ -597,7 +610,9 @@
 "--socket=pulseaudio",
 "--device=dri",
 "--filesystem=host",
+"--filesystem=xdg-run/dconf",
 "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+"--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
 "--env=JAVA_HOME=/app/jre",
 "--env=LIBO_FLATPAK=1",
 "--own-name=org.libreoffice.LibreOfficeIpc0",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits